diff --git a/TODO b/TODO
index 9c9d9bc..1b3f644 100644
--- a/TODO
+++ b/TODO
@@ -1,8 +1,3 @@
-= General =
-
-* In the README, should we remove references to snapshots on
-  code.haskell.org?
-
 = Release management =
 
 * generate, and push website haddocks with xmonad-web/gen-docs.sh
diff --git a/man/HCAR.tex b/man/HCAR.tex
index 338494a..68d6e6a 100644
--- a/man/HCAR.tex
+++ b/man/HCAR.tex
@@ -58,9 +58,9 @@ Binary packages of XMonad and XMonadContrib are available for all major Linux di
 \item Homepage:
  \url{http://xmonad.org/}
 
-\item Darcs source:
+\item Git source:
 
- \texttt{darcs get} \url{http://code.haskell.org/xmonad}
+ \texttt{git clone} \url{https://github.com/xmonad/xmonad.git}
 
 \item IRC channel:
  \verb+#xmonad @@ irc.freenode.org+
diff --git a/man/xmonad.1 b/man/xmonad.1
index 0eaf383..a932b65 100644
--- a/man/xmonad.1
+++ b/man/xmonad.1
@@ -1,4 +1,7 @@
-.TH xmonad 1 "31 December 2012" xmonad-0.12 "xmonad manual".TH "" "" "" "" ""
+.TH xmonad 1 "31 December 2012" xmonad-0.12 "xmonad manual".\" Automatically generated by Pandoc 1.15.1
+.\"
+.hy
+.TH "" "" "" "" ""
 .SH Name
 .PP
 xmonad \- a tiling window manager
@@ -276,4 +279,4 @@ module was contained within xmonad or xmonad\-contrib.
 .PP
 Probably.
 If you find any, please report them to the
-bugtracker (http://code.google.com/p/xmonad/issues/list)
+bugtracker (https://github.com/xmonad/xmonad/issues)
diff --git a/man/xmonad.1.html b/man/xmonad.1.html
index ba59b35..2beffdb 100644
--- a/man/xmonad.1.html
+++ b/man/xmonad.1.html
@@ -160,6 +160,6 @@
   function1 = error &quot;function1: Not implemented yet!&quot;</code></pre>
 <p>Your xmonad.hs may then import XMonad.Stack.MyAdditions as if that module was contained within xmonad or xmonad-contrib.</p>
 <h1 id="bugs">Bugs</h1>
-<p>Probably. If you find any, please report them to the <a href="http://code.google.com/p/xmonad/issues/list">bugtracker</a></p>
+<p>Probably. If you find any, please report them to the <a href="https://github.com/xmonad/xmonad/issues">bugtracker</a></p>
 </body>
 </html>
diff --git a/man/xmonad.1.markdown b/man/xmonad.1.markdown
index fb30cfc..22564ab 100644
--- a/man/xmonad.1.markdown
+++ b/man/xmonad.1.markdown
@@ -101,4 +101,4 @@ module was contained within xmonad or xmonad-contrib.
 Probably. If you find any, please report them to the [bugtracker]
 
 [xmonad.org]: http://xmonad.org
-[bugtracker]: http://code.google.com/p/xmonad/issues/list
+[bugtracker]: https://github.com/xmonad/xmonad/issues
diff --git a/util/GenerateManpage.hs b/util/GenerateManpage.hs
index b9ac27a..e96d076 100644
--- a/util/GenerateManpage.hs
+++ b/util/GenerateManpage.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE FlexibleContexts #-}
 -- Unlike the rest of xmonad, this file is copyright under the terms of the
 -- GPL.
 
@@ -12,7 +13,7 @@
 -- Format for the docstrings in Config.hs takes the following form:
 --
 -- -- mod-x %! Frob the whatsit
--- 
+--
 -- "Frob the whatsit" will be used as the description for keybinding "mod-x"
 --
 -- If the keybinding name is omitted, it will try to guess from the rest of the
@@ -34,7 +35,7 @@ import Distribution.PackageDescription
 import Text.PrettyPrint.HughesPJ
 import Distribution.Text
 
-import Text.Pandoc -- works with 1.12.4
+import Text.Pandoc -- works with 1.15.x
 
 releaseDate = "31 December 2012"
 
@@ -69,7 +70,7 @@ main = do
 
     let manHeader = unwords [".TH xmonad 1","\""++releaseDate++"\"",releaseName,"\"xmonad manual\""]
 
-    parsed <- readMarkdown def
+    Right parsed <- readMarkdown def
         . unlines
         . replace "___KEYBINDINGS___" keybindings
         . lines