diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
new file mode 100644
index 000000000000..85720f644831
--- /dev/null
+++ b/pkgs/applications/misc/khal/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, pkgs, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+  version = "0.4.0";
+  name = "khal-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/geier/khal/archive/v${version}.tar.gz";
+    sha256 = "0d32miq55cly4q3raxkw3xpq4d5y3hvzaqvy066nv35bdlpafxi1";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [
+    atomicwrites
+    click
+    configobj
+    dateutil
+    icalendar
+    lxml
+    pkgs.vdirsyncer
+    pytz
+    pyxdg
+    requests_toolbelt
+    tzlocal
+    urwid
+  ];
+
+  meta = {
+    homepage = http://lostpackets.de/khal/;
+    description = "CLI calendar application";
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f00392005f6..200c9a5b83e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10675,6 +10675,10 @@ let
 
   keymon = callPackage ../applications/video/key-mon { };
 
+  khal = callPackage ../applications/misc/khal {
+    pythonPackages = python3Packages;
+  };
+
   kid3 = callPackage ../applications/audio/kid3 {
     qt = qt4;
   };