diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix
new file mode 100644
index 00000000000..301d7eb8e41
--- /dev/null
+++ b/pkgs/development/tools/misc/openocd/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "openocd-0.2.0";
+
+  src = fetchurl {
+    url = "http://download.berlios.de/openocd/openocd-0.2.0.tar.bz2";
+    sha256 = "1qdl2a2mxhl07xz32l9nxjvmf16b0717aqlrhd28akn6si3jps54";
+  };
+
+  meta = {
+    homepage = http://openocd.berlios.de;
+    description = "Open On Chip Debugger";
+    license = "GPLv2";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67e71c662f4..4386e5d8f39 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2689,6 +2689,10 @@ let
     inherit fetchurl stdenv;
   };
 
+  openocd = import ../development/tools/misc/openocd {
+    inherit fetchurl stdenv;
+  };
+
   oprofile = import ../development/tools/profiling/oprofile {
     inherit fetchurl stdenv binutils popt;
     inherit makeWrapper gawk which gnugrep;