diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 16e4c1e35ff0..8b2ec6300663 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -233,6 +233,7 @@
   phausmann = "Philipp Hausmann <nix@314.ch>";
   philandstuff = "Philip Potter <philip.g.potter@gmail.com>";
   phreedom = "Evgeny Egorochkin <phreedom@yandex.ru>";
+  phunehehe = "Hoang Xuan Phu <phunehehe@gmail.com>";
   pierron = "Nicolas B. Pierron <nixos@nbp.name>";
   piotr = "Piotr Pietraszkiewicz <ppietrasa@gmail.com>";
   pjbarnoy = "Perry Barnoy <pjbarnoy@gmail.com>";
diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix
new file mode 100644
index 000000000000..8388d63d6b28
--- /dev/null
+++ b/pkgs/servers/mail/archiveopteryx/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, openssl, perl, zlib }:
+stdenv.mkDerivation rec {
+  version = "3.2.0";
+  name = "archiveopteryx-${version}";
+  src = fetchurl {
+    url = "http://archiveopteryx.org/download/${name}.tar.bz2";
+    sha256 = "0i0zg8di8nbh96qnyyr156ikwcsq1w9b2291bazm5whb351flmqx";
+  };
+  buildInputs = [ openssl perl zlib ];
+  installPhase = ''
+    INSTALLROOT=$out make install
+    mkdir $out/bin
+    ln --symbolic $out/usr/local/archiveopteryx/sbin/* $out/bin/
+    ln --symbolic $out/usr/local/archiveopteryx/bin/* $out/bin/
+  '';
+  meta = with stdenv.lib; {
+    homepage = http://archiveopteryx.org/;
+    description = "An advanced PostgreSQL-based IMAP/POP server";
+    license = licenses.postgresql;
+    maintainers = [ maintainers.phunehehe ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 920423920940..257455181098 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9110,6 +9110,8 @@ let
   apacheHttpdPackages_2_2 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_2 pkgs.apacheHttpdPackages_2_2;
   apacheHttpdPackages_2_4 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4;
 
+  archiveopteryx = callPackage ../servers/mail/archiveopteryx/default.nix { };
+
   cadvisor = callPackage ../servers/monitoring/cadvisor { };
 
   cassandra_1_2 = callPackage ../servers/nosql/cassandra/1.2.nix { };