diff --git a/MakeManPage.hs b/MakeManPage.hs
index ceaedd412..f165fbd68 100644
--- a/MakeManPage.hs
+++ b/MakeManPage.hs
@@ -10,7 +10,8 @@ main = do
   rmContents <- liftM toString $ B.readFile "README"
   let (Pandoc meta blocks) = readMarkdown defaultParserState rmContents
   let newBlocks = removeWrapperSect blocks
-  manTemplate <- liftM toString $ B.readFile "manpage.template"
+  manTemplate <- liftM toString $ B.readFile
+                 $ "man" </> "man1" </> "pandoc.1.template"
   let opts = defaultWriterOptions{ writerStandalone = True
                                  , writerTemplate = manTemplate }
   let manPage = writeMan opts $
diff --git a/manpage.template b/man/man1/pandoc.1.template
similarity index 100%
rename from manpage.template
rename to man/man1/pandoc.1.template
diff --git a/pandoc.cabal b/pandoc.cabal
index 977ea6b3a..b73941f14 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -73,7 +73,7 @@ Extra-Source-Files:
                  man/man1/markdown2pdf.1.md,
                  -- code to create pandoc.1 man page
                  MakeManPage.hs,
-                 manpage.template,
+                 man/man1/pandoc.1.template,
                  -- generated man pages (produced post-build)
                  man/man1/markdown2pdf.1,
                  man/man1/pandoc.1,