diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix
index 00a9aa1fc683..988320dd61fc 100644
--- a/pkgs/applications/networking/irc/irssi/otr/default.nix
+++ b/pkgs/applications/networking/irc/irssi/otr/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }:
 
 let
-  rev = "cab3fc915c";
+  rev = "640e98c74b";
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "irssi-otr-20130601-${rev}";
+  name = "irssi-otr-20131007-${rev}";
   
   src = fetchurl {
     url = "https://github.com/cryptodotis/irssi-otr/tarball/${rev}";
     name = "${name}.tar.gz";
-    sha256 = "0kn9c562zfh36gpcrbpslwjjr78baagdwphczz2d608ndczm1vrk";
+    sha256 = "0d08ianzhy20w0ld8xx7hgrp9psg54l37619pcdpqyrnlzkkdalz";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/libraries/libotr/0001-Fix-pass-opdata-when-sending-message-fragment.patch b/pkgs/development/libraries/libotr/0001-Fix-pass-opdata-when-sending-message-fragment.patch
deleted file mode 100644
index 2b39d1fee9a4..000000000000
--- a/pkgs/development/libraries/libotr/0001-Fix-pass-opdata-when-sending-message-fragment.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From dc5f05eb934ebd285e01febb9a4018512db702b1 Mon Sep 17 00:00:00 2001
-From: David Goulet <dgoulet@ev0ke.net>
-Date: Sat, 19 Jan 2013 15:53:23 -0500
-Subject: [PATCH] Fix: pass opdata when sending message fragment
-
-The inject_message callback was missing the opdata when sending message
-fragments.
-
-Signed-off-by: David Goulet <dgoulet@ev0ke.net>
----
- src/message.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/message.c b/src/message.c
-index 7c39529..aa71df2 100644
---- a/src/message.c
-+++ b/src/message.c
-@@ -441,7 +441,7 @@ fragment:
- 	/* Fragment and send according to policy */
- 	if (!err && messagep && *messagep) {
- 	    if (context) {
--		err = fragment_and_send(ops, NULL, context, *messagep,
-+		err = fragment_and_send(ops, opdata, context, *messagep,
- 			fragPolicy, messagep);
- 	    }
- 	}
--- 
-1.7.10.4
-
diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix
index d737b8d9916e..560b807dbaf5 100644
--- a/pkgs/development/libraries/libotr/default.nix
+++ b/pkgs/development/libraries/libotr/default.nix
@@ -1,23 +1,18 @@
-{stdenv, fetchurl, libgcrypt}:
+{stdenv, fetchgit, libgcrypt, autoconf, automake, libtool}:
 
 stdenv.mkDerivation rec {
-  name = "libotr-4.0.0";
-  src = fetchurl {
-    urls = [
-      "http://www.cypherpunks.ca/otr/${name}.tar.gz"
-      # The site is down at the time of updating to 4.0.0, so I add this url
-      http://ftp.de.debian.org/debian/pool/main/libo/libotr/libotr_4.0.0.orig.tar.gz
-    ];
-    sha256 = "3f911994409898e74527730745ef35ed75c352c695a1822a677a34b2cf0293b4";
+  name = "libotr-20130821-git-f0f8a2";
+  src = fetchgit {
+    url = "http://git.code.sf.net/p/otr/libotr";
+    rev = "f0f8a2";
+    sha256 = "08019r8bnk8f4yx6574jdz217p283ry7dmpqcad2d87yhkdmc3mm";
   };
 
-  # Crashes without it, still not accepted upstream.
-  # Discussed in https://github.com/cryptodotis/irssi-otr/issues/21
-  patches = [ ./0001-Fix-pass-opdata-when-sending-message-fragment.patch ];
-
   NIX_LDFLAGS = "-lssp";
 
-  propagatedBuildInputs = [ libgcrypt ];
+  propagatedBuildInputs = [ libgcrypt autoconf automake libtool ];
+
+  preConfigure = "autoreconf -vfi";
 
   meta = {
     homepage = "http://www.cypherpunks.ca/otr/";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 890432d03904..36374308bbbc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4935,7 +4935,9 @@ let
 
   libosip_3 = callPackage ../development/libraries/osip/3.nix {};
 
-  libotr = callPackage ../development/libraries/libotr { };
+  libotr = callPackage ../development/libraries/libotr {
+    libgcrypt = libgcrypt_1_6;
+  };
 
   libotr_3_2 = callPackage ../development/libraries/libotr/3.2.nix { };