diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix
new file mode 100644
index 000000000000..df13dbf6ecc4
--- /dev/null
+++ b/pkgs/applications/misc/gphoto2/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, pkgconfig, libgphoto2, libexif, popt}:
+
+stdenv.mkDerivation {
+  name = "gphoto2-2.1.99";
+  src = fetchurl {
+    url = http://surfnet.dl.sourceforge.net/sourceforge/gphoto/gphoto2-2.1.99.tar.bz2;
+    md5 = "549a9dfae6910ab6456b194ea86b55a2";
+  };
+  buildInputs = [pkgconfig libgphoto2 libexif popt];
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index f559c299a0ad..551be095a01a 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -1977,6 +1977,10 @@ rec {
     inherit fetchurl stdenv ncurses;
   };
 
+  gphoto2 = (import ../applications/misc/gphoto2) {
+    inherit fetchurl stdenv pkgconfig libgphoto2 libexif popt;
+  };
+
   xchm = (import ../applications/misc/xchm) {
     inherit fetchurl stdenv wxGTK chmlib;
   };