diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix
index 362e21a3fcff..1d51c4864a18 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/pkgs/tools/networking/dropbear/default.nix
@@ -31,6 +31,10 @@ stdenv.mkDerivation rec {
     # Allow sessions to inherit the PATH from the parent dropbear.
     # Otherwise they only get the usual /bin:/usr/bin kind of PATH
     ./pass-path.patch
+
+    # Bugfix
+    # http://article.gmane.org/gmane.network.ssh.dropbear/1361
+    ./proxycrash.patch
   ];
 
   buildInputs = [ zlib ];
diff --git a/pkgs/tools/networking/dropbear/proxycrash.patch b/pkgs/tools/networking/dropbear/proxycrash.patch
new file mode 100644
index 000000000000..1a17e7e3c624
--- /dev/null
+++ b/pkgs/tools/networking/dropbear/proxycrash.patch
@@ -0,0 +1,17 @@
+diff -r 5ba19d00da08 cli-runopts.c
+--- a/cli-runopts.c	Sun May 26 18:43:00 2013 +0800
++++ b/cli-runopts.c	Mon Jun 17 19:51:08 2013 +0000
+@@ -383,6 +383,13 @@
+ 		exit(EXIT_FAILURE);
+ 	}
+
++#ifdef ENABLE_CLI_PROXYCMD
++	if (cli_opts.proxycmd) {
++		/* To match the common path of m_freeing it */
++		cli_opts.proxycmd = m_strdup(cli_opts.proxycmd);
++	}
++#endif
++
+ 	if (cli_opts.remoteport == NULL) {
+ 		cli_opts.remoteport = "22";
+ 	}