diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,59 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to the [Package Versioning Policy](https://wiki.haskell.org/Package_versioning_policy).
+
+## [3001.3.0.1]
+### Changed
+- Bumped doctest to version < 0.12
+
+## [3001.3.0.0]
+### Changed
+- Cookie.hs: cookieExpires now has type `Maybe UTCTime` rather than
+`Maybe CalendarTime`
+- Protocol.hs: URL decoding functions no longer decode UTF-8 encoding
+- Functor and Applicative instance of CGIT no longer constrain Functor or
+Applicative parameter to be an instance of Monad
+
+## [3001.2.2.3]
+### Changed
+* CGI.hs haddock: Use web.archive.org link for CGI specification
+
+## [3001.2.2.2]
+### Changed
+- Added support for building with mtl < 2.2.1 via flags
+
+## [3001.2.2.1]
+### Changed
+- Bumped exceptions version to < 0.9
+
+## [3001.2.2.0]
+### Added
+- MonadMask instance for CGIT
+
+## [3001.2.1.0]
+### Added
+- Applicative instance for CGI Monad
+
+### Changed
+- Deduplicate shared with `multipart` code
+
+## 3001.2.0.0
+### Changed
+- GHC 7.8.3 support
+
+[Unreleased]:
+https://github.com/cheecheeo/haskell-cgi/compare/3001.3.0.1...HEAD
+[3001.3.0.1]:
+https://github.com/cheecheeo/haskell-cgi/compare/3001.3.0.0...3001.3.0.1
+[3001.3.0.0]:
+https://github.com/cheecheeo/haskell-cgi/compare/3001.2.2.3...3001.3.0.0
+[3001.2.2.3]:
+https://github.com/cheecheeo/haskell-cgi/compare/3001.2.2.2...3001.2.2.3
+[3001.2.2.2]:
+https://github.com/cheecheeo/haskell-cgi/compare/3001.2.2.1...3001.2.2.2
+[3001.2.2.1]:
+https://github.com/cheecheeo/haskell-cgi/compare/3001.2.2.0...3001.2.2.1
+[3001.2.2.0]:
+https://github.com/cheecheeo/haskell-cgi/compare/3001.2.1.0...3001.2.2.0
+[3001.2.1.0]:
+https://github.com/cheecheeo/haskell-cgi/compare/3001.2.0.0...3001.2.1.0
diff --git a/cgi.cabal b/cgi.cabal
--- a/cgi.cabal
+++ b/cgi.cabal
@@ -1,5 +1,5 @@
 Name: cgi
-Version: 3001.3.0.0
+Version: 3001.3.0.1
 Copyright: Bjorn Bringert, John Chee, Andy Gill, Anders Kaseorg,
            Ian Lynagh, Erik Meijer, Sven Panne, Jeremy Shaw
 Category: Network
@@ -13,7 +13,7 @@
 Description:
  This is a Haskell library for writing CGI programs.
 Build-Type: Simple
-extra-source-files: changelog
+extra-source-files: CHANGELOG.md
 Cabal-Version: >=1.8
 
 source-repository head
@@ -72,7 +72,7 @@
   ghc-options:      -Wall
   build-depends:
       base
-    , doctest >= 0.8 && < 0.11
+    , doctest >= 0.8 && < 0.12
     , QuickCheck >= 2.8.1 && < 2.9
 
 --Executable:     printinput
diff --git a/changelog b/changelog
deleted file mode 100644
--- a/changelog
+++ /dev/null
@@ -1,39 +0,0 @@
-# Change Log
-All notable changes to this project will be documented in this file.
-This project adheres to the [Package Versiioning Policy](https://wiki.haskell.org/Package_versioning_policy).
-
-## 3001.3.0.0
-### Changed
-- Cookie.hs: cookieExpires now has type `Maybe UTCTime` rather than
-`Maybe CalendarTime`
-- Protocol.hs: URL decoding functions no longer decode UTF-8 encoding
-- Functor and Applicative instance of CGIT no longer constrain Functor or
-Applicative parameter to be an instance of Monad
-
-## 3001.2.2.3
-
-### Changed
-* CGI.hs haddock: Use web.archive.org link for CGI specification
-
-## 3001.2.2.2
-### Changed
-- Added support for building with mtl < 2.2.1 via flags
-
-## 3001.2.2.1
-### Changed
-- Bumped exceptions version to < 0.9
-
-## 3001.2.2.0
-### Added
-- MonadMask instance for CGIT
-
-## 3001.2.1.0
-### Added
-- Applicative instance for CGI Monad
-
-### Changed
-- Deduplicate shared with `multipart` code
-
-## 3001.2.0.0
-### Changed
-- GHC 7.8.3 support