diff --git a/pkgs/tools/compression/bzip2/builder-cygwin.sh b/pkgs/tools/compression/bzip2/builder-cygwin.sh
new file mode 100644
index 00000000000..efeb9dac657
--- /dev/null
+++ b/pkgs/tools/compression/bzip2/builder-cygwin.sh
@@ -0,0 +1,26 @@
+source $stdenv/setup
+installFlags="PREFIX=$out"
+
+if test -n "$sharedLibrary"; then
+
+    preBuild=preBuild
+    preBuild() {
+        make -f Makefile-libbz2_so
+    }
+
+    preInstall=preInstall
+    preInstall() {
+        ensureDir $out/lib
+        mv libbz2.so* $out/lib
+    }
+    
+fi
+
+postInstall=postInstall
+postInstall() {
+    rm $out/bin/bunzip2* $out/bin/bzcat*
+    ln -s bzip2 $out/bin/bunzip2
+    ln -s bzip2 $out/bin/bzcat
+}
+
+genericBuild
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index b7a2717b85e..20b0d5ebe16 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "bzip2-1.0.3";
-  builder = ./builder.sh;
+  builder = if stdenv.system == "i686-cygwin" then ./builder-cygwin.sh else ./builder.sh; # !!! merge
     
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/bzip2-1.0.3.tar.gz;