diff --git a/Text/Pandoc/XML.hs b/Text/Pandoc/XML.hs
index a09a8c150..14e2eebbb 100644
--- a/Text/Pandoc/XML.hs
+++ b/Text/Pandoc/XML.hs
@@ -38,12 +38,12 @@ import Text.PrettyPrint.HughesPJ
 -- | Escape one character as needed for XML.
 escapeCharForXML :: Char -> String
 escapeCharForXML x = case x of
-                       '&'  -> "&"
-                       '<'  -> "&lt;"
-                       '>'  -> "&gt;"
-                       '"'  -> "&quot;"
-                       '\160' -> "&nbsp;"
-                       c    -> [c]
+                       '&'    -> "&amp;"
+                       '<'    -> "&lt;"
+                       '>'    -> "&gt;"
+                       '"'    -> "&quot;"
+                       '\160' -> "&#160;"
+                       c      -> [c]
 
 -- | True if the character needs to be escaped.
 needsEscaping :: Char -> Bool
diff --git a/tests/writer.docbook b/tests/writer.docbook
index 4860e7d66..e8f963b58 100644
--- a/tests/writer.docbook
+++ b/tests/writer.docbook
@@ -606,7 +606,7 @@ These should not be escaped:  \$ \\ \&gt; \[ \{
         Should not be a list item:
       </para>
       <para>
-        M.A.&nbsp;2007
+        M.A.&#160;2007
       </para>
       <para>
         B. Williams
@@ -795,12 +795,12 @@ These should not be escaped:  \$ \\ \&gt; \[ \{
     <para>
       Superscripts: a<superscript>bc</superscript>d
       a<superscript><emphasis>hello</emphasis></superscript>
-      a<superscript>hello&nbsp;there</superscript>.
+      a<superscript>hello&#160;there</superscript>.
     </para>
     <para>
       Subscripts: H<subscript>2</subscript>O,
       H<subscript>23</subscript>O,
-      H<subscript>many&nbsp;of&nbsp;them</subscript>O.
+      H<subscript>many&#160;of&#160;them</subscript>O.
     </para>
     <para>
       These should not be superscripts or subscripts, because of the