diff --git a/src/Text/Pandoc/Writers/DokuWiki.hs b/src/Text/Pandoc/Writers/DokuWiki.hs
index 76a0463eb..ea56ac393 100644
--- a/src/Text/Pandoc/Writers/DokuWiki.hs
+++ b/src/Text/Pandoc/Writers/DokuWiki.hs
@@ -31,7 +31,6 @@ DokuWiki:  <https://www.dokuwiki.org/dokuwiki>
 -}
 
 {-
-    [ ] Correct handling of Span
     [ ] Implement nested blockquotes (currently only ever does one level)
     [ ] Implement alignment of text in tables
     [ ] Implement comments
@@ -348,12 +347,9 @@ inlineListToDokuWiki opts lst = mapM (inlineToDokuWiki opts) lst >>= return . co
 -- | Convert Pandoc inline element to DokuWiki.
 inlineToDokuWiki :: WriterOptions -> Inline -> State WriterState String
 
-inlineToDokuWiki _opts (Span _attrs _ils) = do
-  return ""
-  {-
+inlineToDokuWiki opts (Span _attrs ils) = do
   contents <- inlineListToDokuWiki opts ils
-  return $ render Nothing (tagWithAttrs "span" attrs) ++ contents ++ "</span>"
-  -}
+  return contents
 
 inlineToDokuWiki opts (Emph lst) = do
   contents <- inlineListToDokuWiki opts lst
diff --git a/tests/dokuwiki.inline_formatting.dokuwiki b/tests/dokuwiki.inline_formatting.dokuwiki
index 2faf49eec..e02596e6c 100644
--- a/tests/dokuwiki.inline_formatting.dokuwiki
+++ b/tests/dokuwiki.inline_formatting.dokuwiki
@@ -2,7 +2,7 @@ Regular text //italics// **bold //bold italics//**.
 
 This is Small Caps, and this is <del>strikethrough</del>.
 
-Some people use .
+Some people use single underlines for //emphasis//.
 
 Above the line is <sup>superscript</sup> and below the line is <sub>subscript</sub>.