diff --git a/.gitignore b/.gitignore
index 6bdc034..68f8cc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /pogo-0.5.tar.gz
+/pogo-0.6.tar.gz
diff --git a/pogo.spec b/pogo.spec
index 01a7499..5a516ba 100644
--- a/pogo.spec
+++ b/pogo.spec
@@ -1,5 +1,5 @@
 Name:		pogo
-Version:	0.5
+Version:	0.6
 Release:	2%{?dist}
 Summary:	Probably the simplest and fastest audio player for Linux
 Summary(de):	Möglicherweise der einfachste und schnellste Audioplayer für Linux
@@ -8,11 +8,6 @@ Group:		Applications/Multimedia
 License:	GPLv2+
 URL:		https://launchpad.net/%{name}
 Source0:	https://launchpad.net/%{name}/trunk/%{version}/+download/%{name}-%{version}.tar.gz
-# The patch removes the first line from __init__.py because this file
-# shouldn't be executable.
-# Fixed in upstream VCS:
-# http://bazaar.launchpad.net/~jendrikseipp/pogo/trunk/revision/476
-Patch0:		pogo_init.patch
 BuildArch:	noarch
 BuildRequires:	intltool
 BuildRequires:	desktop-file-utils
@@ -42,7 +37,6 @@ Pogo ist ein Fork des Decibel Audio Players.
 
 %prep
 %setup -q
-%patch0 -p0
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -56,12 +50,34 @@ desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/%{name}/
+%exclude %{_datadir}/%{name}/src/modules/Zeitgeist.*
 %{_datadir}/pixmaps/%{name}.png
 %{_mandir}/man1/%{name}.1.*
 
+%package        zeitgeist
+Summary:        Zeitgeist module for Pogo
+Summary(de):	Zeigeist-Modul für Pogo
+Group:          Applications/Mutimedia
+Requires:       %{name} = %{version}-%{release}
+Requires:	zeitgeist
+
+%description	zeitgeist
+This package provides Zeitgeist functionality to log played albums in Pogo.
+
+%description	zeitgeist -l de
+Dieses Paket stellt die Funktionalität zum Protokollieren von den
+in Pogo abgespielten Alben bereit.
+
+%files	zeitgeist
+%{_datadir}/%{name}/src/modules/Zeitgeist.*
 
 %changelog
 
+* Sun Apr 01 2012 Mario Blättermann <mariobl@fedoraproject.org> 0.6-1
+- New upstream version
+- Removed patch again
+- Splitted Zeitgeist functionality into a subpackage 
+
 * Tue Mar 20 2012 Mario Blättermann <mariobl@fedoraproject.org> 0.5-2
 - Added more info about the patch
 - Consistent use of macros
diff --git a/pogo_init.patch b/pogo_init.patch
deleted file mode 100644
index 97ced4e..0000000
--- a/pogo_init.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- src/__init__.py	2012-01-12 13:54:45.000000000 +0100
-+++ src/__init__.py	2012-03-13 22:48:45.750417455 +0100
-@@ -1,4 +1,3 @@
--#!/usr/bin/env python
- # -*- coding: utf-8 -*-
- #
- # Copyright (c) 2010  Jendrik Seipp (jendrikseipp@web.de)
diff --git a/sources b/sources
index 9a135ca..3cd8ab4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6e77d4b15753b6eed2fc8f4dce92d770  pogo-0.5.tar.gz
+79c4fda0d242fa380b6e8dfd37506a2a  pogo-0.6.tar.gz