diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix
index a71e9c7ff92d..4269a116085d 100644
--- a/pkgs/applications/misc/font-manager/default.nix
+++ b/pkgs/applications/misc/font-manager/default.nix
@@ -1,39 +1,43 @@
 { stdenv, fetchFromGitHub, makeWrapper, automake, autoconf, libtool,
   pkgconfig, file, intltool, libxml2, json_glib , sqlite, itstool,
-  vala, gnome3
+  vala, gnome3, wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
   name = "font-manager-${version}";
-  version = "git-2016-03-02";
+  version = "2016-06-04";
 
   src = fetchFromGitHub {
     owner  = "FontManager";
     repo   = "master";
-    rev    = "743fb83558c86bfbbec898106072f84422c175d6";
-    sha256 = "1sakss6irfr3d8k39x1rf72fmnpq47akhyrv3g45a3l6v6xfqp3k";
+    rev    = "07b47c153494f19ced291c84437349253c5bde4d";
+    sha256 = "13pjmvx31fr8fqhl5qwawhawfl7as9c50qshzzig8n5g7vb5v1i0";
     };
 
-  enableParallelBuilding = true;
-
-  buildInputs = [
+  nativeBuildInputs = [
     makeWrapper
     pkgconfig
     automake autoconf libtool
     file
     intltool
+    vala
+    gnome3.yelp_tools
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
     libxml2
     json_glib
     sqlite
     itstool
-    vala
     gnome3.gtk
     gnome3.gucharmap
     gnome3.libgee
     gnome3.file-roller
-    gnome3.yelp_tools
   ];
 
+  enableParallelBuilding = true;
+
   preConfigure = ''
     NOCONFIGURE=true ./autogen.sh
     chmod +x configure;
@@ -42,13 +46,6 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--disable-pycompile";
 
-  preFixup = ''
-    for prog in "$out/bin/"* "$out/libexec/font-manager/"*; do
-      wrapProgram "$prog" \
-        --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
   meta = {
     homepage = https://fontmanager.github.io/;
     description = "Simple font management for GTK+ desktop environments";
@@ -62,8 +59,8 @@ stdenv.mkDerivation rec {
       Font Manager is NOT a professional-grade font management solution.
     '';
     license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
     repositories.git = https://github.com/FontManager/master;
     platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f6b40dc92f5..0a4228eb1ed6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12562,7 +12562,7 @@ in
   focuswriter = callPackage ../applications/editors/focuswriter { };
 
   font-manager = callPackage ../applications/misc/font-manager {
-    vala = vala_0_28;
+    vala = vala_0_32;
   };
 
   foo-yc20 = callPackage ../applications/audio/foo-yc20 { };