diff --git a/pandoc-crossref.cabal b/pandoc-crossref.cabal
--- a/pandoc-crossref.cabal
+++ b/pandoc-crossref.cabal
@@ -2,7 +2,7 @@
 -- documentation, see http://haskell.org/cabal/users-guide/
 
 name:                pandoc-crossref
-version:             0.1.5.4
+version:             0.1.5.5
 synopsis:            Pandoc filter for cross-references
 description:         pandoc-crossref is a pandoc filter for numbering figures, equations, tables and cross-references to them.
 license:             GPL-2
@@ -23,7 +23,7 @@
 source-repository this
   type: git
   location: https://github.com/lierdakil/pandoc-crossref
-  tag: v0.1.5.4
+  tag: v0.1.5.5
 
 library
   exposed-modules:     Text.Pandoc.CrossRef
diff --git a/src/Text/Pandoc/CrossRef/References/Blocks.hs b/src/Text/Pandoc/CrossRef/References/Blocks.hs
--- a/src/Text/Pandoc/CrossRef/References/Blocks.hs
+++ b/src/Text/Pandoc/CrossRef/References/Blocks.hs
@@ -39,7 +39,7 @@
           f | isFormat "latex" f ->
             RawInline (Format "tex") ("\\label{"++label++"}") : alt
           _  -> applyTemplate idxStr alt $ figureTemplate opts
-    return $ Para [Image alt' (fst img,"fig:")]
+    return $ Para [Image alt' img]
 replaceBlocks opts (Div (label,_,attrs) [Plain [Math DisplayMath eq]])
   | "eq:" `isPrefixOf` label
   = case outFormat opts of
@@ -113,9 +113,9 @@
 replaceBlocks _ x = return x
 
 divBlocks :: Block -> Block
-divBlocks (Para (Image alt img:c))
+divBlocks (Para (Image alt (img, title):c))
   | Just label <- getRefLabel "fig" c
-  = Div (label,[],[]) [Plain [Image alt (fst img, "fig:")]]
+  = Div (label,[],[]) [Plain [Image alt (img, "fig:" ++ title)]]
 divBlocks (Para (math@(Math DisplayMath _eq):c))
   | Just label <- getRefLabel "eq" c
   = Div (label,[],[]) [Plain [math]]