diff --git a/src/Text/Pandoc/Readers/MediaWiki.hs b/src/Text/Pandoc/Readers/MediaWiki.hs
index 89564f504..e8952f9af 100644
--- a/src/Text/Pandoc/Readers/MediaWiki.hs
+++ b/src/Text/Pandoc/Readers/MediaWiki.hs
@@ -30,6 +30,8 @@ Conversion of mediawiki text to 'Pandoc' document.
 -}
 {-
 TODO:
+_ tables - cell alignment and width
+_ calculate cell widths when not given???  see html? latex? reader
 _ support tables http://www.mediawiki.org/wiki/Help:Tables
 - footnotes?
 -}
@@ -225,6 +227,10 @@ tableCell :: MWParser Blocks
 tableCell = try $ do
   cellsep
   skipMany spaceChar
+  attrs <- (parseAttrs <$>
+                  manyTill (satisfy (/='\n'))
+                    (try $ char '|' <* notFollowedBy (char '|')))
+  skipMany spaceChar
   ls <- many (notFollowedBy (cellsep <|> rowsep <|> tableEnd) *> anyChar)
   parseFromString (mconcat <$> many block) ls