diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix
new file mode 100644
index 000000000000..726b805fe91a
--- /dev/null
+++ b/pkgs/development/tools/icestorm/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, python3, libftdi }:
+
+stdenv.mkDerivation rec {
+  name = "icestorm-${version}";
+  version = "2015.12.29";
+
+  src = fetchFromGitHub {
+    owner = "cliffordwolf";
+    repo = "icestorm";
+    rev = "7852514c2cde208da87b62777b2c5e482092f50d";
+    sha256 = "1ya1nk5h28hjdmd8jdrlfiayr2434rnvi133gs1p0ay21qb3iwfz";
+  };
+
+  buildInputs = [ python3 libftdi ];
+  preBuild = ''
+    makeFlags="DESTDIR=$out $makeFlags"
+  '';
+
+  meta = {
+    description = "Documentation and tools for Lattice iCE40 FPGAs";
+    longDescription = ''
+      Project IceStorm aims at reverse engineering and
+      documenting the bitstream format of Lattice iCE40
+      FPGAs and providing simple tools for analyzing and
+      creating bitstream files.
+    '';
+    homepage = http://www.clifford.at/icestorm/;
+    license = stdenv.lib.licenses.isc;
+    maintainers = [ stdenv.lib.maintainers.shell ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ec1aff8776c..fe73bf83c9a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5755,6 +5755,8 @@ let
 
   hyenae = callPackage ../tools/networking/hyenae { };
 
+  icestorm = callPackage ../development/tools/icestorm { };
+
   icmake = callPackage ../development/tools/build-managers/icmake { };
 
   iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils {