diff --git a/WEditorHyphen.cabal b/WEditorHyphen.cabal
--- a/WEditorHyphen.cabal
+++ b/WEditorHyphen.cabal
@@ -1,5 +1,5 @@
 name:                WEditorHyphen
-version:             0.1.0.4
+version:             0.1.0.5
 synopsis:            Language-specific hyphenation policies for WEditor.
 
 description:
diff --git a/WEditorHyphen/LangHyphen.hs b/WEditorHyphen/LangHyphen.hs
--- a/WEditorHyphen/LangHyphen.hs
+++ b/WEditorHyphen/LangHyphen.hs
@@ -61,27 +61,31 @@
 instance WordSplitter LangHyphen Char where
   splitWord (LangHyphen l h) k w cs
     | w < (minWidth l) || k > w = Nothing
-    | k >= length cs || k < 3   = Just []
     | otherwise = Just breaks where
-        (nb,cs',ne) = trimPunct l cs
-        (n0:ns) = map length $ hyphenate h cs'
+        (cb,cs',ce) = trimPunct l cs
+        (s0:ss) = hyphenate h cs'
         breaks
           -- Move the word to the next line if it has punctuation in the middle.
-          | any (noSplitChars l) cs' = []
-          | null ns = []
-          | otherwise = combine k (nb+n0) (init ns ++ [ne+last ns])
+          | any (noSplitChars l) cs' || null ss = []
+          | otherwise = combine k (cb ++ s0) (init ss ++ [last ss ++ ce])
         combine _ _ [] = []
-        combine t n (k:ks)
+        combine t x (y:ys)
+          -- Move the rest to the next line if the segment is already too large.
+          | size x > t = []
           -- Add a break if adding a segment would exceed the remaining space.
-          | (n+k > t-(length (hyphenChar l)) && not (null ks)) || n+k > t = n:(combine w k ks)
+          | length (x ++ y) > t && null ys = (length x):(combine w y ys)
+          | size   (x ++ y) > t            = (length x):(combine w y ys)
           -- Append the next segment to the current segment.
-          | otherwise = combine t (n+k) ks
+          | otherwise = combine t (x ++ y) ys
+        size s = if hyphenChar l `isSuffixOf` s
+                    then length s
+                    else length s+length (hyphenChar l)
   isWordChar (LangHyphen l _) = wordChars l
   isWhitespace (LangHyphen l _) = whitespaceChars l
   appendHyphen (LangHyphen l _) = (++ hyphenChar l)
   endsWithHyphen (LangHyphen l _) cs
-    | null cs || null (hyphenChar l) = False
-    | otherwise = hyphenChar l `isSuffixOf` cs
+    | null (hyphenChar l) = False
+    | otherwise           = hyphenChar l `isSuffixOf` cs
 
 -- Set the language-specific minimum line width here.
 minWidth :: Language -> Int
@@ -136,8 +140,8 @@
 hyphenChar :: Language -> [Char]
 hyphenChar _ = "-"
 
-trimPunct :: Language -> [Char] -> (Int,[Char],Int)
+trimPunct :: Language -> [Char] -> ([Char],[Char],[Char])
 trimPunct l cs =
-  (length $ takeWhile (noSplitChars l) cs,
+  (takeWhile (noSplitChars l) cs,
    dropWhile (noSplitChars l) $ reverse $ dropWhile (noSplitChars l) $ reverse cs,
-   length $ takeWhile (noSplitChars l) $ reverse cs)
+   takeWhile (noSplitChars l) $ reverse cs)
diff --git a/test/TestLangHyphen.hs b/test/TestLangHyphen.hs
--- a/test/TestLangHyphen.hs
+++ b/test/TestLangHyphen.hs
@@ -32,7 +32,13 @@
 
 
 allTests :: [(String,IO (Maybe String))]
-allTests = tests_English_US
+allTests = tests_English_US ++ [
+    ("langHyphen multiple segments on first line", checkLineBreak
+       (setLineWidth (breakWords (langHyphen English_US)) 12)
+       "the existentialism"
+       [hyphenLine "the existen",
+        endLine "tialism"])
+  ]
 
 tests_English_US :: [(String,IO (Maybe String))]
 tests_English_US = [
@@ -85,6 +91,13 @@
         hyphenLine "some",
         hyphenLine "thing",
         endLine "ness"]),
+    ("langHyphen English_US existing hyphen at end of line", checkLineBreak
+       (setLineWidth (breakWords (langHyphen English_US)) 8)
+       " pseudo-somethingness"
+       [innerLine " pseudo-",
+        hyphenLine "some",
+        hyphenLine "thing",
+        endLine "ness"]),
     ("langHyphen English_US apostrophe toward end", checkLineBreak
        (setLineWidth (breakWords (langHyphen English_US)) 8)
        "something's"
@@ -94,12 +107,7 @@
        (setLineWidth (breakWords (langHyphen English_US)) 8)
        "    aren't"
        [innerLine "    ",
-        endLine "aren't"]),
-    ("langHyphen English_US multiple segments on first line", checkLineBreak
-       (setLineWidth (breakWords (langHyphen English_US)) 12)
-       "the existentialism"
-       [hyphenLine "the existen",
-        endLine "tialism"])
+        endLine "aren't"])
   ]
 
 checkLineBreak b x ys = do