diff --git a/.gitignore b/.gitignore
index 1952169..b05efa7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /snapper-0.1.7.tar.gz
 /snapper-0.1.8.tar.gz
 /snapper-0.2.3.tar.gz
+/snapper-0.2.5.tar.gz
diff --git a/snapper-securelibdir.patch b/snapper-securelibdir.patch
index 701102c..c5f6b1f 100644
--- a/snapper-securelibdir.patch
+++ b/snapper-securelibdir.patch
@@ -1,8 +1,9 @@
---- a/pam/Makefile.am	2013-07-12 10:47:19.000000000 +0200
-+++ a/pam/Makefile.am	2013-07-29 14:42:37.633082979 +0200
-@@ -8,7 +8,7 @@ AM_CFLAGS = -D_GNU_SOURCE
+diff -rupN snapper-0.2.5.old/pam/Makefile.am snapper-0.2.5.new/pam/Makefile.am
+--- snapper-0.2.5.old/pam/Makefile.am	2015-01-19 16:55:45.000000000 +0100
++++ snapper-0.2.5.new/pam/Makefile.am	2015-01-30 16:31:43.122790381 +0100
+@@ -8,7 +8,7 @@ AM_CFLAGS = -D_GNU_SOURCE -Wwrite-string
  
- INCLUDES = -I$(top_srcdir) $(DBUS_CFLAGS)
+ AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
  
 -securelibdir = $(shell echo /`basename $(libdir)`/security)
 +securelibdir = $(libdir)/security
diff --git a/snapper.spec b/snapper.spec
index 72ba4c4..294e803 100644
--- a/snapper.spec
+++ b/snapper.spec
@@ -1,11 +1,11 @@
 Name:		snapper
-Version:	0.2.3
-Release:	3%{?dist}
+Version:	0.2.5
+Release:	1%{?dist}
 License:	GPLv2
 Group:		Applications/System
 BuildRequires:	boost-devel gettext libtool libxml2-devel dbus-devel
 BuildRequires:	pam-devel libxslt docbook-style-xsl libacl-devel
-BuildRequires:	btrfs-progs-devel >= 3.12
+BuildRequires:	btrfs-progs-devel >= 3.16.2 libmount-devel >= 2.24
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 Requires:	diffutils
 Summary:	Tool for filesystem snapshot management
@@ -13,10 +13,9 @@ Url:		http://en.opensuse.org/Portal:Snapper
 
 Source0:	https://github.com/openSUSE/snapper/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 patch0:		%{name}-remove-ext4-info-xml.patch
-patch1:		%{name}-remove-rollback-info-xml.patch
-patch2:		%{name}-boost-mt.patch
-patch3:		%{name}-securelibdir.patch
-patch4:		%{name}-systemd-timer.patch
+patch1:		%{name}-boost-mt.patch
+patch2:		%{name}-securelibdir.patch
+patch3:		%{name}-systemd-timer.patch
 
 %description
 This package contains snapper, a tool for filesystem snapshot management.
@@ -25,6 +24,7 @@ This package contains snapper, a tool for filesystem snapshot management.
 Summary:	Library for filesystem snapshot management
 Group:		System Environment/Libraries
 Requires:	util-linux%{?_isa} btrfs-progs%{?_isa} >= 3.12
+Requires:	libmount%{?_isa} >= 2.24
 
 %description libs
 This package contains the snapper shared library
@@ -34,6 +34,7 @@ for filesystem snapshot management.
 Group:		Development/Libraries
 Requires:	%{name}%{?_isa} = %{version}-%{release}
 Requires:	libstdc++-devel%{?_isa} boost-devel%{?_isa} libxml2-devel%{?_isa}
+Requires:	libmount-devel%{?_isa} >= 2.24
 Summary:	Header files and documentation for libsnapper
 
 %description devel
@@ -54,7 +55,6 @@ A PAM module for calling snapper during user login and logout.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 aclocal
@@ -64,7 +64,7 @@ automake --add-missing --copy
 autoconf
 # NOTE: --disable-ext4 option removes support for ext4 internal snapshots since the feature
 # never made it into upstream kernel
-%configure --disable-silent-rules --disable-ext4 --disable-zypp --disable-rollback
+%configure --disable-silent-rules --disable-ext4 --disable-zypp
 #NOTE: avoid 'unused-direct-shlib-dependency' warning in rpmlint checks
 sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 make %{?_smp_mflags}
@@ -123,6 +123,10 @@ rm -rf %{buildroot}/%{_sysconfdir}/cron.daily
 %doc %{_mandir}/*/pam_snapper*.*
 
 %changelog
+* Fri Jan 30 2015 Ondrej Kozina <okozina@redhat.com> - 0.2.5-1
+- Update to snapper 0.2.5
+- enable rollback support (btrfs, w/o grub2 plugin yet)
+
 * Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 0.2.3-3
 - Rebuild for boost 1.57.0
 
diff --git a/sources b/sources
index 16bf248..fb94a38 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-500f461a1bbf194c04c2917fc1e58e3d  snapper-0.2.3.tar.gz
+ff9db46ec307197c3527efd43769db70  snapper-0.2.5.tar.gz