diff --git a/Lib/textwrap.py b/Lib/textwrap.py
index fdb95d7..b0c7042 100644
--- a/Lib/textwrap.py
+++ b/Lib/textwrap.py
@@ -75,7 +75,7 @@
     # (after stripping out empty strings).
     wordsep_re = re.compile(r'(\s+|'                  # any whitespace
                             r'-*\w{2,}-(?=\w{2,})|'   # hyphenated words
-                            r'(?<=\S)-{2,}(?=\w))')   # em-dash
+                            r'(?<=[\w\!\"\'\&\.\,\?])-{2,}(?=\w))')   # em-dash
 
     # XXX will there be a locale-or-charset-aware version of
     # string.lowercase in 2.3?