diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix
index 9afabe0372d1..19fd910195fa 100644
--- a/pkgs/applications/misc/viking/default.nix
+++ b/pkgs/applications/misc/viking/default.nix
@@ -1,33 +1,37 @@
-{ fetchurl, stdenv, pkgconfig, intltool, gettext, gtk, expat, curl
+{ fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk, expat, curl
 , gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper
-, docbook_xml_dtd_412 }:
+, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel }:
 
-let version = "1.3"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "viking-${version}";
+  version = "1.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/viking/viking/${version}/viking-${version}.tar.gz";
-    sha256 = "1psgy1myx9xn7zgpvqrpricsv041sz41mm82hj5i28k72fq47p2l";
+    url = "mirror://sourceforge/viking/viking/viking-${version}.tar.bz2";
+    sha256 = "02ljnnc1in3cnafmld93qvzgx3j4qsgac2a53q18s6sp5hvvvw91";
   };
 
-  buildInputs =
-   [ pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils
-     libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412
-   ];
+  buildInputs = [ makeWrapper pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils
+    libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite
+  ];
 
-  configureFlags = [ "--disable-scrollkeeper" ];
+  configureFlags = [ "--disable-scrollkeeper --disable-mapnik" ];
 
-  preBuild =
-    '' sed -i help/Makefile \
-           -e 's|--noout|--noout --nonet --path "${scrollkeeper}/share/xml/scrollkeeper/dtds"|g'
-    '';
+  preBuild = ''
+    sed -i help/Makefile \
+        -e 's|--noout|--noout --nonet --path "${scrollkeeper}/share/xml/scrollkeeper/dtds"|g'
+    sed -i help/Makefile -e 's|--postvalid||g'
+  '';
 
   doCheck = true;
 
-  meta = {
-    description = "GPS data editor and analyzer";
+  postInstall = ''
+    wrapProgram $out/bin/viking \
+      --prefix PATH : "${gpsbabel}/bin"
+  '';
 
+  meta = with stdenv.lib; {
+    description = "GPS data editor and analyzer";
     longDescription = ''
       Viking is a free/open source program to manage GPS data.  You
       can import and plot tracks and waypoints, show Openstreetmaps
@@ -35,9 +39,8 @@ stdenv.mkDerivation {
       on the map, make new tracks and waypoints, see real-time GPS
       position, etc.
     '';
-
     homepage = http://viking.sourceforge.net/;
-
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ed719b96cb81..1f3596b28d79 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3322,6 +3322,7 @@ let
 
   viking = callPackage ../applications/misc/viking {
     inherit (gnome) scrollkeeper;
+    inherit (gnome3) gexiv2;
   };
 
   vnc2flv = callPackage ../tools/video/vnc2flv {};