diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix
index b497784861f4..7672318392f1 100644
--- a/pkgs/os-specific/linux/jfbview/default.nix
+++ b/pkgs/os-specific/linux/jfbview/default.nix
@@ -1,40 +1,44 @@
-{ stdenv, fetchFromGitHub, freetype, imlib2, jbig2dec, libjpeg, libX11, mujs
-, mupdf, ncurses, openjpeg, openssl }:
+# FIXME: remove gcc49 when the default gcc supports C++1y
+{ stdenv, fetchFromGitHub, freetype, gcc49, imlib2, jbig2dec, libjpeg, libX11
+, mujs, mupdf, ncurses, openjpeg, openssl }:
 
+let
+  version = "0.5.1";
+  binaries = [ "jfbpdf" "jfbview" "jpdfcat" "jpdfgrep" ];
+in
 stdenv.mkDerivation rec {
-  version = "0.4.2"; # TODO: update to 0.5 or later when nixpkgs has caught up
   name = "jfbview-${version}";
 
   src = fetchFromGitHub {
+    sha256 = "113bkf49q04k9rjps5l28ychmzsfjajp9cjhr433s9ld0972z01m";
+    rev = version;
     repo = "JFBView";
     owner = "jichu4n";
-    rev = version;
-    sha256 = "1hhlzvs0jhygd3mqpzg5zymrbay9c8ilc4wjnwg00lvxhv3rwswr";
   };
 
-  buildInputs = [ freetype imlib2 jbig2dec libjpeg libX11 mujs mupdf ncurses
-    openjpeg openssl ];
+  buildInputs = [ freetype gcc49 imlib2 jbig2dec libjpeg libX11 mujs mupdf
+    ncurses openjpeg openssl ];
 
+  buildFlags = binaries;
   enableParallelBuilding = true;
 
-  makeFlags = "jfbpdf jfbview";
-
   installPhase = ''
     mkdir -p $out/bin
-    install jfbpdf jfbview $out/bin
+    install ${toString binaries} $out/bin
   '';
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "PDF and image viewer for the Linux framebuffer";
     longDescription = ''
-      PDF and image viewer for the Linux framebuffer. Very fast with a number
-      of advanced and unique features including:
-      - Reads PDFs (MuPDF) and common image formats (Imlib2).
-      - Supports arbitrary zoom (10% - 1000%) and rotation.
-      - Table of Contents (TOC) viewer for PDF documents.
-      - Multi-threaded rendering on multi-core machines.
-      - Asynchronous background rendering of the next page.
-      - Customizable multi-threaded caching.
+      A very fast PDF and image viewer for the Linux framebuffer with some
+      advanced and unique features, including:
+      - Reads PDFs (MuPDF) and common image formats (Imlib2)
+      - Supports arbitrary zoom (10% - 1000%) and rotation
+      - Table of Contents (TOC) viewer for PDF documents
+      - Multi-threaded rendering on multi-core machines
+      - Asynchronous background rendering of the next page
+      - Customizable multi-threaded caching
     '';
     homepage = http://seasonofcode.com/pages/jfbview.html;
     license = with licenses; asl20;