diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix
new file mode 100644
index 00000000000..7828cf84398
--- /dev/null
+++ b/pkgs/servers/http/yaws/default.nix
@@ -0,0 +1,35 @@
+{stdenv, fetchurl, erlang, pam, perl }:
+
+stdenv.mkDerivation rec {
+  name = "yaws-${version}";
+  version = "1.95";
+
+  src = fetchurl {
+    url = "http://yaws.hyber.org/download/${name}.tar.gz";
+    sha256 = "01jlp6v8l95n9k5rbp4kvklnh95q7yv9lp2a6ahyixb1cn1sxvz4";
+  };
+
+  # The tarball includes a symlink yaws -> yaws-1.95, which seems to be
+  # necessary for importing erlang files
+  unpackPhase = ''
+    tar xzf $src
+    cd $name
+  '';
+
+  configureFlags = "--with-extrainclude=${pam}/include/security";
+
+  buildInputs = [ erlang pam perl ];
+
+  postInstall = ''
+    sed -i "s#which #type -P #" $out/bin/yaws
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A high performance HTTP 1.1 server in Erlang";
+    homepage = http://http://yaws.hyber.org;
+    license = licenses.bsd2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f6e6164aa99..efdb5887251 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5671,6 +5671,8 @@ let
 
   xorgVideoUnichrome = callPackage ../servers/x11/xorg/unichrome/default.nix { };
 
+  yaws = callPackage ../servers/http/yaws { };
+
   zabbix = recurseIntoAttrs (import ../servers/monitoring/zabbix {
     inherit fetchurl stdenv pkgconfig postgresql curl openssl zlib;
   });