diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 261dc758382f..984bd27aa34a 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -106,6 +106,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  bsdiff = (import ../tools/compression/bsdiff) {
+    inherit fetchurl stdenv;
+  };
+
   which = (import ../tools/system/which) {
     inherit fetchurl stdenv;
   };
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index 12621d727a76..c22599f53581 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -15,6 +15,7 @@ let {
     gzip
     bzip2
     zdelta
+    bsdiff
     wget
     par2cmdline
     cksfv
diff --git a/pkgs/tools/compression/bsdiff/builder.sh b/pkgs/tools/compression/bsdiff/builder.sh
new file mode 100644
index 000000000000..46fb9e0ff165
--- /dev/null
+++ b/pkgs/tools/compression/bsdiff/builder.sh
@@ -0,0 +1,8 @@
+. $stdenv/setup
+
+installFlags="PREFIX=$out INSTALL=install"
+
+ensureDir "$out/bin"
+ensureDir "$out/man/man1"
+
+genericBuild
diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix
new file mode 100644
index 000000000000..9f1c3ecf8bcb
--- /dev/null
+++ b/pkgs/tools/compression/bsdiff/default.nix
@@ -0,0 +1,11 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "bsdiff-4.2";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.daemonology.net/bsdiff/bsdiff-4.2.tar.gz;
+    md5 = "9f582a77eb76d116d82d1ad268ef48fa";
+  };
+  patches = [./makefile.patch];
+}
diff --git a/pkgs/tools/compression/bsdiff/makefile.patch b/pkgs/tools/compression/bsdiff/makefile.patch
new file mode 100644
index 000000000000..94a4048631c3
--- /dev/null
+++ b/pkgs/tools/compression/bsdiff/makefile.patch
@@ -0,0 +1,22 @@
+diff -rc bsdiff-orig/Makefile bsdiff-4.2/Makefile
+*** bsdiff-orig/Makefile	2004-07-11 20:10:02.000000000 +0200
+--- bsdiff-4.2/Makefile	2004-11-29 22:15:05.000000000 +0100
+***************
+*** 1,7 ****
+  CFLAGS		+=	-O3
+- .ifdef BZIP2
+- CFLAGS		+=	-DBZIP2=\"${BZIP2}\"
+- .endif
+  
+  PREFIX		?=	/usr/local
+  INSTALL_PROGRAM	?=	${INSTALL} -c -s -m 555
+--- 1,4 ----
+***************
+*** 13,18 ****
+  
+  install:
+  	${INSTALL_PROGRAM} bsdiff bspatch ${PREFIX}/bin
+- .ifndef WITHOUT_MAN
+  	${INSTALL_MAN} bsdiff.1 bspatch.1 ${PREFIX}/man/man1
+- .endif
+--- 10,13 ----