diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
new file mode 100644
index 00000000000..8f18cb46861
--- /dev/null
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, libevent, zlib, openssl, db4, bison, pam }:
+
+stdenv.mkDerivation rec {
+  name = "opensmtpd-${version}";
+  version = "201306271531p1";
+
+  buildInputs = [ libevent zlib openssl db4 bison pam ];
+
+  src = fetchurl {
+    url = "http://www.opensmtpd.org/archives/${name}.tar.gz";
+    sha256 = "0b06vzv566nai9j506rl3cwkk5favqxg23hsn08490ynn23im0sc";
+  };  
+
+  configureFlags = [ 
+    "--with-mantype=doc"
+    "--with-pam"
+    "--without-bsd-auth"
+    "--with-sock-dir=/run"
+    "--with-privsep-user=smtpd"
+    "--with-queue-user=smtpq"
+  ];  
+
+  meta = {
+    homepage = "http://www.postfix.org/";
+    description = ''
+      A free implementation of the server-side SMTP protocol as defined by
+      RFC 5321, with some additional standard extensions.
+    '';
+    license = stdenv.lib.licenses.isc;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.rickynils ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24492ca7d86..00f1d2463db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5926,6 +5926,8 @@ let
 
   nginx = callPackage ../servers/http/nginx { };
 
+  opensmtpd = callPackage ../servers/mail/opensmtpd { };
+
   petidomo = callPackage ../servers/mail/petidomo { };
 
   popa3d = callPackage ../servers/mail/popa3d { };