diff --git a/Text/Markdown/Inline.hs b/Text/Markdown/Inline.hs
--- a/Text/Markdown/Inline.hs
+++ b/Text/Markdown/Inline.hs
@@ -72,7 +72,7 @@
     <|> footnoteRef
     <|> paired "**" InlineBold <|> paired "__" InlineBold
     <|> paired "*" InlineItalic <|> paired "_" InlineItalic
-    <|> doubleCode <|> code
+    <|> doubleCodeSpace <|> doubleCode <|> code
     <|> link
     <|> image
     <|> autoLink
@@ -96,7 +96,8 @@
         is <- inlinesTill t
         if null is then fail "wrapped around something missing" else return is
 
-    doubleCode = InlineCode . T.pack <$> (string "`` " *> manyTill anyChar (string " ``"))
+    doubleCodeSpace = InlineCode . T.pack <$> (string "`` " *> manyTill anyChar (string " ``"))
+    doubleCode = InlineCode . T.pack <$> (string "``" *> manyTill anyChar (string "``"))
     code = InlineCode <$> (char '`' *> takeWhile1 (/= '`') <* char '`')
 
     footnoteRef = InlineFootnoteRef <$> (char '{' *> decimal <* char '}')
diff --git a/markdown.cabal b/markdown.cabal
--- a/markdown.cabal
+++ b/markdown.cabal
@@ -1,5 +1,5 @@
 Name:                markdown
-Version:             0.1.6
+Version:             0.1.6.1
 Synopsis:            Convert Markdown to HTML, with XSS protection
 Description:         This library leverages existing high-performance libraries (attoparsec, blaze-html, text, and conduit), and should integrate well with existing codebases.
 Homepage:            https://github.com/snoyberg/markdown
diff --git a/test/examples/double-backtick.html b/test/examples/double-backtick.html
new file mode 100644
--- /dev/null
+++ b/test/examples/double-backtick.html
@@ -0,0 +1,1 @@
+<p>This is a paragraph with <code>double `backtick` inside</code> with space.</p><p>This is a paragraph with <code>double `backtick` inside</code> without space.</p>
diff --git a/test/examples/double-backtick.md b/test/examples/double-backtick.md
new file mode 100644
--- /dev/null
+++ b/test/examples/double-backtick.md
@@ -0,0 +1,3 @@
+This is a paragraph with `` double `backtick` inside `` with space.
+
+This is a paragraph with ``double `backtick` inside`` without space.