diff --git a/pkgs/development/tools/winhelpcgi/default.nix b/pkgs/development/tools/winhelpcgi/default.nix
new file mode 100644
index 000000000000..cd7bfe344357
--- /dev/null
+++ b/pkgs/development/tools/winhelpcgi/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, libwmf, libpng, pkg-config, lib }: stdenv.mkDerivation {
+  name = "winhelpcgi-1.0-rc3";
+
+  src = fetchurl {
+    url = "http://www.herdsoft.com/ftp/winhelpcgi_1.0-1.tar.gz";
+    sha256 = "sha256-9HIs50ZGoTfGixD9c/DQs0KJMQtmfsDVB8qRMnQtXNw=";
+
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ libwmf libpng ];
+
+  meta = {
+    description = "CGI module for Linux, Solaris, MacOS X and AIX to read Windows Help Files";
+
+    homepage = "http://www.herdsoft.com/linux/produkte/winhelpcgi.html";
+
+    license = lib.licenses.gpl2Only;
+
+    maintainers = [ lib.maintainers.shlevy ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e2a6a76198c..9e9cce3f1806 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3346,6 +3346,10 @@ with pkgs;
 
   wiiload = callPackage ../development/tools/wiiload { };
 
+  winhelpcgi = callPackage ../development/tools/winhelpcgi {
+    libpng = libpng12;
+  };
+
   wiimms-iso-tools = callPackage ../tools/filesystems/wiimms-iso-tools { };
 
   waypoint = callPackage ../applications/networking/cluster/waypoint { };