diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix
new file mode 100644
index 00000000000..3c88423d045
--- /dev/null
+++ b/pkgs/applications/misc/merkaartor/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, qt, boost}:
+
+stdenv.mkDerivation {
+  name = "merkaartor-0.16.0";
+  src = fetchurl {
+    url = http://www.merkaartor.org/downloads/source/merkaartor-0.16.0.tar.bz2;
+    sha256 = "0l33vgwwkqj65i86qq5j33bbf6q02hs8r1frjnd7icqdaqqv08d7";
+  };
+
+  configurePhase = ''
+    qmake -makefile PREFIX=$out
+  '';
+
+  buildInputs = [ qt boost ];
+
+  meta = {
+    description = "An openstreetmap editor";
+    homepage = http://merkaartor.org/;
+    license = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38c6e411acb..4a046c84d6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8204,6 +8204,11 @@ let
       else pythonBase;
   };
 
+  merkaartor = import ../applications/misc/merkaartor {
+    inherit fetchurl stdenv boost;
+    qt = qt4;
+  };
+
   meshlab = import ../applications/graphics/meshlab {
     inherit fetchurl stdenv bzip2 lib3ds levmar muparser unzip;
     qt = qt4;