diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
new file mode 100644
index 00000000000..0f28b15ea97
--- /dev/null
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchgit, autoconf, automake, boost, pkgconfig, libtool, acl, libxml2, btrfsProgs, dbus_libs, docbook_xsl, libxslt, docbook_xml_dtd_45,  diffutils, pam, utillinux, attr, gettext }:
+
+stdenv.mkDerivation rec {
+  name = "snapper-0.2.4";
+
+  src = fetchgit {
+    url = "https://github.com/openSUSE/snapper";
+    rev = "24e18153f7a32d0185dcfb20f8b8a4709ba8fe4a";
+    sha256 = "ec4b829430bd7181995e66a26ac86e8ac71c27e77faf8eb06db71d645c6f859b";
+  };
+
+  buildInputs = [ autoconf automake boost pkgconfig libtool acl libxml2 btrfsProgs dbus_libs docbook_xsl libxslt docbook_xml_dtd_45 diffutils pam utillinux attr gettext ];
+
+  patchPhase = ''
+    # work around missing btrfs/version.h; otherwise, use "-DHAVE_BTRFS_VERSION_H"
+    substituteInPlace snapper/Btrfs.cc --replace "define BTRFS_LIB_VERSION (100)" "define BTRFS_LIB_VERSION (200)";
+    # fix strange SuSE boost naming
+    substituteInPlace snapper/Makefile.am --replace \
+      "libsnapper_la_LIBADD = -lboost_thread-mt -lboost_system-mt -lxml2 -lacl -lz -lm" \
+      "libsnapper_la_LIBADD = -lboost_thread -lboost_system -lxml2 -lacl -lz -lm";
+    # general cleanup
+    sed -i 's/^INCLUDES/AM_CPPFLAGS/' $(grep -rl ^INCLUDES .|grep "\.am$")
+    '';
+
+  configurePhase = ''
+    aclocal
+    libtoolize --force --automake --copy
+    autoheader
+    automake --add-missing --copy
+    autoconf
+
+    ./configure --disable-silent-rules --disable-ext4 --disable-btrfs-quota --prefix=$out
+    '';
+
+  makeFlags = "DESTDIR=$(out)";
+
+  NIX_CFLAGS_COMPILE = [ "-I${libxml2}/include/libxml2" ];
+
+  # Probably a hack, but using DESTDIR and PREFIX makes everything work!
+  postInstall = ''
+    cp -r $out/$out/* $out
+    rm -r $out/nix
+    '';
+
+  meta = with stdenv.lib; {
+    description = "Tool for Linux filesystem snapshot management";
+    homepage = http://snapper.io;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.tstrobel ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d70eb6882b0..4fec686a2e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10106,6 +10106,8 @@ let
 
   smartdeblur = callPackage ../applications/graphics/smartdeblur { };
 
+  snapper = callPackage ../tools/misc/snapper { };
+
   snd = callPackage ../applications/audio/snd { };
 
   shntool = callPackage ../applications/audio/shntool { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index db7f48b05d9..22afbe25e99 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10818,6 +10818,27 @@ let
     };
   };
 
+  snapperGUI = buildPythonPackage rec {
+    name = "Snapper-GUI";
+
+    src = fetchgit {
+      url = "https://github.com/ricardomv/snapper-gui";
+      rev = "11d98586b122180c75a86fccda45c4d7e3137591";
+      sha256 = "7a9f86fc17dbf130526e70c3e925eac30e2c74d6b932efbf7e7cd9fbba6dc4b1";
+    };
+
+    # no tests available
+    doCheck = false;
+
+    propagatedBuildInputs = with pythonPackages; [ pygobject3 dbus ];
+
+    meta = {
+      homepage = https://github.com/ricardomv/snapper-gui;
+      description = "Graphical frontend for snapper";
+      license = licenses.gpl2;
+      maintainers = [ stdenv.lib.maintainers.tstrobel ];
+    };
+  };
 
 # python2.7 specific packages
 } // optionalAttrs isPy27 (
@@ -10937,5 +10958,4 @@ let
       maintainers = [ stdenv.lib.maintainers.DamienCassou ];
     };
   };
-
 }); in pythonPackages