diff --git a/.travis.yml b/.travis.yml
index 158ad58fa..1a4e10080 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,6 @@ dist: trusty
 
 env:
   matrix:
-    - EMACS=emacs23           TARGET=check
     - EMACS=emacs24           TARGET=check
     - EMACS=emacs-snapshot    TARGET=check
     - TARGET=deploy-manual
@@ -16,10 +15,6 @@ matrix:
     - env: EMACS=emacs-snapshot    TARGET=check
 
 install:
-  - if [ "$EMACS" = "emacs23" ]; then
-        sudo apt-get update &&
-        sudo apt-get install --no-install-suggests --no-install-recommends --assume-yes emacs23-nox;
-    fi
   - if [ "$EMACS" = "emacs24" ]; then
         sudo apt-get update &&
         sudo apt-get install --no-install-suggests --no-install-recommends --assume-yes emacs24-nox;
diff --git a/Makefile b/Makefile
index 0a202c8c5..7c24d75ac 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@
 # We should have a script that changes it everywhere it is needed and
 # syncs it with current git tag.
 #
-VERSION = 13.17-git
+VERSION = 16.1-git
 
 INSTALL_INFO = install-info
 
diff --git a/README.md b/README.md
index a48392994..4a7bf65a2 100644
--- a/README.md
+++ b/README.md
@@ -65,8 +65,7 @@ for setup and user guide.
 
 ## Installation - more information
 
-`haskell-mode` supports GNU Emacs versions 23, 24 and upcoming 25
-(snapshot).
+`haskell-mode` supports GNU Emacs version 24 or later.
 
 `haskell-mode` is available from [melpa-stable](http://stable.melpa.org) (releases) and [melpa](http://melpa.org)
 (git snapshots).
@@ -75,18 +74,6 @@ Other means of obtaining `haskell-mode` include
 [el-get](https://github.com/dimitri/el-get),
 [Emacs Prelude](https://github.com/bbatsov/prelude) and [Debian package](https://packages.debian.org/search?keywords=haskell-mode).
 
-Emacs23 requires an the use of "cl-lib".  cl-lib.el can be found in
-the tests/compat directory.  Copy cl-lib.el to your emacs
-directory, e.g. ~/.emacs.d directory and put
-
-```el
-(add-to-list 'load-path "~/.emacs.d/")
-(require 'cl-lib)
-```
-
-in your .emacs file.
-
-
 ## Installation from git repository
 
 Running `haskell-mode` directly from sources is easy but
diff --git a/doc/haskell-mode.texi b/doc/haskell-mode.texi
index a76854fa2..294b1a716 100644
--- a/doc/haskell-mode.texi
+++ b/doc/haskell-mode.texi
@@ -2,7 +2,7 @@
 @c %**start of header
 @setfilename haskell-mode.info
 @documentencoding UTF-8
-@settitle Haskell Mode 13.17-git
+@settitle Haskell Mode 16.1-git
 @c %**end of header
 
 @dircategory Emacs
@@ -11,9 +11,9 @@
 @end direntry
 
 @copying
-This manual is for Haskell mode, version 13.17-git
+This manual is for Haskell mode, version 16.1-git
 
-Copyright @copyright{} 2013 Haskell Mode contributors.
+Copyright @copyright{} 2013-2016 Haskell Mode contributors.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -42,7 +42,7 @@ Front-Cover Texts and no Back-Cover Texts.
 @top Haskell Mode
 
 Haskell Mode is an Haskell development Environment for GNU Emacs version
-23 or later.  It provides syntax-based indentation, font locking,
+24 or later.  It provides syntax-based indentation, font locking,
 editing cabal files, and supports running an inferior Haskell
 interpreter (e.g. GHCi).
 
@@ -156,7 +156,7 @@ source code in color now.
 
 @section Installation - more information
 
-@code{haskell-mode} supports GNU Emacs versions 23, 24 and upcoming 25
+@code{haskell-mode} supports GNU Emacs versions 24 and upcoming 25
 (snapshot).
 
 @code{haskell-mode} is available from @uref{http://stable.melpa.org,melpa-stable (releases)} and @uref{http://melpa.org, melpa
@@ -166,16 +166,9 @@ Other means of obtaining `haskell-mode` include
 @uref{https://github.com/dimitri/el-get, el-get},
 @uref{https://github.com/bbatsov/prelude, Emacs Prelude}) and @uref{https://packages.debian.org/search?keywords=haskell-mode, Debian package}.
 
-Emacs23 requires an the use of @code{cl-lib}.  cl-lib.el can be found in
-the tests/compat directory.  Copy cl-lib.el to your emacs
-directory, e.g. ~/.emacs.d directory and put
-
-@lisp
-(add-to-list 'load-path "~/.emacs.d/")
-(require 'cl-lib)
-@end lisp
-
-in your .emacs file.
+Last version of haskell-mode that supported Emacs 23 is haskell-mode
+13.18 available at
+@uref{https://github.com/haskell/haskell-mode/releases/tag/v13.18}.
 
 @section Customizing
 
diff --git a/haskell-mode-pkg.el b/haskell-mode-pkg.el
index 52d63376d..5ad9ed8a4 100644
--- a/haskell-mode-pkg.el
+++ b/haskell-mode-pkg.el
@@ -1,5 +1,5 @@
-(define-package "haskell-mode" "13.17-git" "A Haskell editing mode"
-  '((cl-lib "0.5"))
+(define-package "haskell-mode" "16.1-git" "A Haskell editing mode"
+  '((emacs "24.1") (cl-lib "0.5"))
   :url "https://github.com/haskell/haskell-mode"
   :keywords '("haskell" "cabal" "ghc" "repl"))
 ;; Local Variables:
diff --git a/haskell-mode.el b/haskell-mode.el
index d41cd87ba..f5fc04714 100644
--- a/haskell-mode.el
+++ b/haskell-mode.el
@@ -9,7 +9,7 @@
 ;;          2001-2002 Reuben Thomas (>=v1.4)
 ;;          2003      Dave Love <fx@gnu.org>
 ;; Keywords: faces files Haskell
-;; Version: 13.17-git
+;; Version: 16.1-git
 ;; URL: https://github.com/haskell/haskell-mode
 
 ;; This file is not part of GNU Emacs.
@@ -145,7 +145,7 @@
 ;; All functions/variables start with `(literate-)haskell-'.
 
 ;; Version of mode.
-(defconst haskell-version "13.15-git"
+(defconst haskell-version "16.1-git"
   "The release version of `haskell-mode'.")
 
 ;;;###autoload
@@ -634,6 +634,9 @@ Minor modes that work well with `haskell-mode':
 - `smerge-mode': show and work with diff3 conflict markers used
   by git, svn and other version control systems."
   :group 'haskell
+  (when (< emacs-major-version 24)
+    (error "haskell-mode requires at least Emacs 24"))
+
   ;; paragraph-{start,separate} should treat comments as paragraphs as well.
   (set (make-local-variable 'paragraph-start)
        (concat " *{-\\| *-- |\\|" page-delimiter))