diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix
new file mode 100644
index 000000000000..fa361308ff1a
--- /dev/null
+++ b/pkgs/applications/misc/fbreader/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, pkgconfig, bzip2, curl, expat, fribidi
+, libunibreak, qt4, sqlite, zlib }:
+
+stdenv.mkDerivation {
+  name = "fbreader-0.99.4";
+
+  src = fetchurl {
+    url = http://fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz;
+    sha256 = "1sdq3vvwkq4bkyrvh0p884d66gaddz8hlab3m798ji9ixbak2z1x";
+  };
+
+  buildInputs = [
+    pkgconfig bzip2 curl expat fribidi libunibreak
+    qt4 sqlite zlib
+  ];
+
+  makeFlags = "INSTALLDIR=$(out)";
+
+  patchPhase = ''
+    # don't try to use ccache
+    substituteInPlace makefiles/arch/desktop.mk \
+      --replace "CCACHE = " "# CCACHE = "
+  
+    substituteInPlace fbreader/desktop/Makefile \
+      --replace "/usr/share" "$out/share"
+  '';
+
+  meta = {
+    description = "An e-book reader for Linux";
+    homepage = http://www.fbreader.org/;
+    license = "GPL";
+    maintainer = [ stdenv.lib.maintainers.coroa ];
+  }; 
+}
diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix
new file mode 100644
index 000000000000..e5e7f5ff0ae8
--- /dev/null
+++ b/pkgs/development/libraries/libunibreak/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libunibreak-${version}";
+  version = "1.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/vimgadgets/libunibreak/${version}/${name}.tar.gz";
+    sha256 = "0rsivyxnp9nfngf83fiy4v58s5mgdhcjz75nv5nyhxwxnjq35d25";
+  };
+
+  meta = {
+    homepage = http://vimgadgets.sourceforge.net/libunibreak/;
+    description = "A library implementing a line breaking algorithm as described in Unicode 6.0.0 Standard";
+    license = "ZLIB";
+    maintainer = [ stdenv.lib.maintainers.coroa ];
+  };
+}
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index f5a8c5bce989..9b1699de0ccd 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -20,6 +20,7 @@
   bodil = "Bodil Stokke <nix@bodil.org>";
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
+  coroa = "Jonas Hörsch <jonas@chaoflow.net>";
   edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
   eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
   ertes = "Ertugrul Söylemez <es@ertes.de>";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bcf832edf07f..37ed41dc9dab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4973,6 +4973,8 @@ let
 
   libungif = callPackage ../development/libraries/giflib/libungif.nix { };
 
+  libunibreak = callPackage ../development/libraries/libunibreak/default.nix { };
+
   libunique = callPackage ../development/libraries/libunique/default.nix { };
 
   liburcu = callPackage ../development/libraries/liburcu { };
@@ -7647,6 +7649,8 @@ let
 
   fbpanel = callPackage ../applications/window-managers/fbpanel { };
 
+  fbreader = callPackage ../applications/misc/fbreader { };
+
   fetchmail = import ../applications/misc/fetchmail {
     inherit stdenv fetchurl openssl;
   };