diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix
new file mode 100644
index 000000000000..309f813ed74d
--- /dev/null
+++ b/pkgs/applications/networking/irc/irssi/otr/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchgit, cmake, pkgconfig, glib, python, libgcrypt, libotr
+, withIrssi ? true, irssi }:
+
+let
+  rev = "9ea5cc4e2e41";
+in
+with stdenv.lib;
+stdenv.mkDerivation {
+  name = "irssi-otr-20120915-${rev}";
+  
+  src = fetchgit {
+    url = git://git.tuxfamily.org/gitroot/irssiotr/irssiotr.git;
+    inherit rev;
+    sha256 = "19zwxiy6h8n6zblqlcy6y9xyixp1yw2k8792rffsaaczjc5lpbvk";
+  };
+
+  patchPhase = ''
+    cp LICENSE README irssi
+  '';
+
+  cmakeFlags = "-DIRCOTR_VERSION=mydistro-git-${rev}" +
+    optionalString withIrssi " -DWANT_IRSSI=ON -DIRSSI_INCLUDE_DIR=${irssi}/include";
+
+  nativeBuildInputs = [ python ];
+
+  buildInputs = [ cmake pkgconfig glib libgcrypt libotr ];
+  
+  meta = {
+    homepage = http://irssi-otr.tuxfamily.org/;
+    license = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b9d26e1fcf9..60ffd7a2d4dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7310,6 +7310,8 @@ let
 
   irssi_fish = callPackage ../applications/networking/irc/irssi/fish { };
 
+  irssi_otr = callPackage ../applications/networking/irc/irssi/otr { };
+
   bip = callPackage ../applications/networking/irc/bip { };
 
   jack_capture = callPackage ../applications/audio/jack-capture { };