diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix
new file mode 100644
index 000000000000..1ea2b761fc89
--- /dev/null
+++ b/pkgs/tools/networking/gmvault/default.nix
@@ -0,0 +1,34 @@
+{ pkgs, fetchurl, buildPythonPackage, pythonPackages }:
+
+buildPythonPackage rec {
+  version = "1.8.1-beta";
+  name = "gmvault-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/gaubert/gmvault-official-download/downloads/gmvault-v${version}-src.tar.gz";
+    name = "${name}.tar.bz";
+    sha256 = "0b575cnrd6jzcpa05mbn2swzcy0r9ck09pkhs4ydj6d3ir52j80c";
+  };
+
+  doCheck = false;
+
+  propagatedBuildInputs = [
+    pythonPackages.gdata
+    pythonPackages.IMAPClient
+    pythonPackages.Logbook
+    pythonPackages.argparse
+  ];
+
+  startScript = ./gmvault.py;
+
+  patchPhase = ''
+    cat ${startScript} > etc/scripts/gmvault
+    chmod +x etc/scripts/gmvault
+  '';
+
+  meta = {
+    description = "Gmvault Gmail Backup - Backup and restore your gmail account at will.";
+    homepage = "http://gmvault.org";
+    license = pkgs.lib.licenses.agpl3Plus;
+  };
+}
diff --git a/pkgs/tools/networking/gmvault/gmvault.py b/pkgs/tools/networking/gmvault/gmvault.py
new file mode 100644
index 000000000000..127036577f38
--- /dev/null
+++ b/pkgs/tools/networking/gmvault/gmvault.py
@@ -0,0 +1,4 @@
+#!/usr/bin/env python
+
+import gmv.gmv_cmd as runner
+runner.bootstrap_run()
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4bad3cbdfb36..d300e8db91c4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -865,6 +865,8 @@ let
 
   glxinfo = callPackage ../tools/graphics/glxinfo { };
 
+  gmvault = callPackage ../tools/networking/gmvault { };
+
   gnokii = builderDefsPackage (import ../tools/misc/gnokii) {
     inherit intltool perl gettext libusb pkgconfig bluez readline pcsclite
       libical gtk glib;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e2e54b13b9d9..7711f4e97a59 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5901,4 +5901,57 @@ pythonPackages = python.modules // rec {
     };
   };
 
+  gdata = buildPythonPackage rec {
+    name = "gdata-${version}";
+    version = "2.0.17";
+
+    src = fetchurl {
+      url = "https://gdata-python-client.googlecode.com/files/${name}.tar.gz";
+      # sha1 = "d2d9f60699611f95dd8c328691a2555e76191c0c";
+      sha256 = "0bdaqmicpbj9v3p0swvyrqs7m35bzwdw1gy56d3k09np692jfwmd";
+    };
+
+    # Fails with "error: invalid command 'test'"
+    doCheck = false;
+
+    meta = {
+      homepage = https://code.google.com/p/gdata-python-client/;
+      description = "Python client library for Google data APIs";
+      license = pkgs.lib.licenses.asl20;
+    };
+  };
+
+  IMAPClient = buildPythonPackage rec {
+    name = "IMAPClient-${version}";
+    version = "0.9.2";
+
+    src = fetchurl {
+      url = "http://freshfoo.com/projects/IMAPClient/${name}.tar.gz";
+      sha256 = "10alpj7074djs048xjc4j7ggd1nrqdqpy0fzl7fj9hddp0rbchs9";
+    };
+
+    meta = {
+      homepage = http://imapclient.freshfoo.com/;
+      description = "Easy-to-use, Pythonic and complete IMAP client library";
+      license = pkgs.lib.licenses.bsd3;
+    };
+  };
+
+  Logbook = buildPythonPackage rec {
+    name = "Logbook-${version}";
+    version = "0.4.1";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/L/Logbook/${name}.tar.gz";
+      # md5 = "143cb15af4c4a784ca785a1546ad1b93";
+      sha256 = "0iim9pcyl57c6z9i1kfw5nz92qrnpz2l0bz4lir2xrqi8m03q3d7";
+    };
+
+    meta = {
+      homepage = http://pythonhosted.org/Logbook/;
+      description = "A logging replacement for Python";
+      license = pkgs.lib.licenses.bsd3;
+    };
+ };
+
 }; in pythonPackages