diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix
new file mode 100644
index 00000000000..6d6370bb97b
--- /dev/null
+++ b/pkgs/games/klavaro/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, intltool, curl, gtk, gtkdatabox }:
+
+stdenv.mkDerivation rec {
+  name = "klavaro-1.9.5";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/klavaro/${name}.tar.bz2";
+    sha256 = "06c35247866fb74f7c1a52a2350b352fdb44dace7216fdbebc1fa54990d14fc9";
+  };
+
+  buildInputs = [ pkgconfig intltool curl gtk gtkdatabox ];
+
+  meta = {
+    description = "Just another free touch typing tutor program";
+
+    license = "GPLv3+";
+
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 672a4afef0e..2dad382086b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -953,6 +953,8 @@ let
 
   less = callPackage ../tools/misc/less { };
 
+  klavaro = callPackage ../games/klavaro {};
+
   minidlna = callPackage ../tools/networking/minidlna { };
 
   most = callPackage ../tools/misc/most { };