diff --git a/pkgs/servers/mail/dovecot/2.0.nix b/pkgs/servers/mail/dovecot/2.x.nix
similarity index 74%
rename from pkgs/servers/mail/dovecot/2.0.nix
rename to pkgs/servers/mail/dovecot/2.x.nix
index 80cb237f6df9..294a58b4f24b 100644
--- a/pkgs/servers/mail/dovecot/2.0.nix
+++ b/pkgs/servers/mail/dovecot/2.x.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, openssl, pam, bzip2, zlib}:
 
-stdenv.mkDerivation {
-  name = "dovecot-2.0.15";
+stdenv.mkDerivation rec {
+  name = "dovecot-2.1.7";
 
   buildInputs = [openssl pam bzip2 zlib];
 
   src = fetchurl {
-    url = http://dovecot.org/releases/2.0/dovecot-2.0.15.tar.gz;
-    sha256 = "03byp6alxxk65qfjjnqp6kcncs5cdiqgskx90nk9kcnynl1h6r33";
+    url = "http://dovecot.org/releases/2.1/${name}.tar.gz";
+    sha256 = "0lpldhs0nvy6rxabqkp14wzcwf1cx4jvnbp1xcm74izrzxhvrdym";
   };
 
   # It will hardcode this for /var/lib/dovecot.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4e79ef1df9e..b98456108b48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5087,7 +5087,8 @@ let
 
   dovecot = callPackage ../servers/mail/dovecot { };
   dovecot_1_1_1 = callPackage ../servers/mail/dovecot/1.1.1.nix { };
-  dovecot_2_0 = callPackage ../servers/mail/dovecot/2.0.nix { };
+  dovecot_2 = callPackage ../servers/mail/dovecot/2.x.nix { };
+  dovecot_2_0 = pkgs.dovecot_2; # Actually, 2.1
 
   ejabberd = callPackage ../servers/xmpp/ejabberd { };