diff --git a/snapper-0.0.6.tar.bz2 b/snapper-0.0.6.tar.bz2
index 3478c9e..afe479d 100644
--- a/snapper-0.0.6.tar.bz2
+++ b/snapper-0.0.6.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e52cbd021c4c8adb77f4e05cf3338148d66e6270e38aa1908b27d70e6edf3a3
-size 306745
+oid sha256:2e73c873f4d4af181b579f6418b6c5b12e98c9e3986129d273efa39560f52673
+size 307359
diff --git a/snapper.changes b/snapper.changes
index ed6cf5d..aff56c7 100644
--- a/snapper.changes
+++ b/snapper.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jun 28 11:46:28 CEST 2011 - aschnell@suse.de
+
+- added snapper-zypp-plugin subpackage (fate #308626)
+
 -------------------------------------------------------------------
 Fri Jun 17 11:02:48 CEST 2011 - aschnell@suse.de
 
diff --git a/snapper.spec b/snapper.spec
index 9c3a0f8..00a7849 100644
--- a/snapper.spec
+++ b/snapper.spec
@@ -1,36 +1,22 @@
 #
-# spec file for package snapper
+# spec file for package snapper (Version 0.0.6)
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
 # norootforbuild
 
-
-Name:           snapper
-Version:        0.0.6
-Release:        3
-License:        GPL
-Group:          System/Packages
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source:         snapper-%{version}.tar.bz2
-Prefix:         /usr
-BuildRequires:  blocxx-devel boost-devel dejagnu doxygen gcc-c++ libxml2-devel
-Requires:       libsnapper1 = %version
-Recommends:     cron logrotate
-Summary:        Tool for filesystem snapshot management
-Url:            http://en.opensuse.org/Portal:Snapper
+Name:		snapper
+Version:	0.0.6
+Release:	0
+License:	GPL
+Group:		System/Packages
+BuildRoot:	%{_tmppath}/%{name}-%{version}-build
+Source:		snapper-%{version}.tar.bz2
+Prefix:		/usr
+BuildRequires:	gcc-c++ boost-devel libblocxx-devel libxml2-devel doxygen
+BuildRequires:	libzypp(plugin:commit)
+Requires:	libsnapper1 = %version
+Recommends:	cron logrotate snapper-zypp-plugin
+Summary:	Tool for filesystem snapshot management
+Url:		http://en.opensuse.org/Portal:Snapper
 
 %description
 This package contains snapper, a tool for filesystem snapshot management.
@@ -73,11 +59,10 @@ rm -rf "$RPM_BUILD_ROOT"
 /etc/cron.daily/suse.de-snapper
 
 %package -n libsnapper1
-
-Summary:        Library for filesystem snapshot management
-Group:          System/Libraries
-Requires:       btrfsprogs diffutils util-linux
-PreReq:         %fillup_prereq
+Summary:	Library for filesystem snapshot management
+Group:		System/Libraries
+Requires:	btrfsprogs diffutils util-linux
+PreReq:		%fillup_prereq
 
 %description -n libsnapper1
 This package contains libsnapper, a library for filesystem snapshot management.
@@ -111,11 +96,10 @@ Authors:
 /sbin/ldconfig
 
 %package -n libsnapper-devel
-
-Requires:       libsnapper1 = %version
-Requires:       gcc-c++ libstdc++-devel boost-devel blocxx-devel libxml2-devel
-Summary:        Header files and documentation for libsnapper
-Group:          Development/Languages/C and C++
+Requires:	libsnapper1 = %version
+Requires:	gcc-c++ libstdc++-devel boost-devel blocxx-devel libxml2-devel
+Summary:	Header files and documentation for libsnapper
+Group:		Development/Languages/C and C++
 
 %description -n libsnapper-devel
 This package contains header files and documentation for developing with
@@ -130,4 +114,20 @@ Authors:
 %{_libdir}/libsnapper.la
 %{_libdir}/libsnapper.so
 %{prefix}/include/snapper
-%changelog
+
+%package -n snapper-zypp-plugin
+Requires:	snapper libzypp(plugin:commit) zypp-plugin-python
+Summary:	A zypp commit plugin for calling snapper
+Group:		System/Packages
+
+%description -n snapper-zypp-plugin
+This package contains a plugin for zypp that makes filesystem snapshots with
+snapper during commits.
+
+Authors:
+--------
+    Arvin Schnell <aschnell@suse.de>
+
+%files -n snapper-zypp-plugin
+%defattr(-,root,root)
+/usr/lib/zypp/plugins/commit/snapper.py