diff --git a/collective-icalendar-4d52777.tar.bz2 b/collective-icalendar-4d52777.tar.bz2
new file mode 100644
index 0000000..a0af004
--- /dev/null
+++ b/collective-icalendar-4d52777.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8aae788e16dc219152bdac238aa48ee7f3101e7eef8a74ba8702849866f8b5ea
+size 121729
diff --git a/icalendar-2.2.tar.gz b/icalendar-2.2.tar.gz
deleted file mode 100644
index 96706dd..0000000
--- a/icalendar-2.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b691b0d229fd9c5b87987f6f74b008fefccd87b2ac74785ed87850bfcc1bea50
-size 152852
diff --git a/python-icalendar-rpmlintrc b/python-icalendar-rpmlintrc
new file mode 100644
index 0000000..26c1590
--- /dev/null
+++ b/python-icalendar-rpmlintrc
@@ -0,0 +1,4 @@
+# This line is mandatory to access the configuration functions
+from Config import *
+
+addFilter("wrong-file-end-of-line-encoding")
diff --git a/python-icalendar.changes b/python-icalendar.changes
index 13a8289..d88211b 100644
--- a/python-icalendar.changes
+++ b/python-icalendar.changes
@@ -1,13 +1,7 @@
 -------------------------------------------------------------------
-Thu Aug 25 10:45:47 UTC 2011 - Sascha.Manns@open-slx.de
+Sun Aug 28 10:09:54 CEST 2011 - hpj@urpla.net
 
-- updated to version 2.2 
-
--------------------------------------------------------------------
-Wed Aug 24 20:02:20 UTC 2011 - Sascha.Manns@open-slx.de
-
-- Changed Ownership
-- removed rpmlintrc 
+- updated to forked version 2.2
 
 -------------------------------------------------------------------
 Fri Dec 24 12:39:25 UTC 2010 - saigkill@opensuse.org
diff --git a/python-icalendar.spec b/python-icalendar.spec
index e0e09be..fe25698 100644
--- a/python-icalendar.spec
+++ b/python-icalendar.spec
@@ -1,55 +1,85 @@
 #
-# Copyright (c) 7/2011 - now  open-slx GmbH <Sascha.Manns@open-slx.de>
-# Copyright (c) 2009 - 7/2011 Sascha Manns <saigkill@opensuse.org> 
-# 
-# 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.
-
+# spec file for package python-csvkit
+#
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Packaged by: <saigkill@opensuse.org>
+# Copyright (c) 2011 LISA GmbH, Bingen, Germany.
+#
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
+
 # # norootforbuild
 %define	module	icalendar
+%define	gitid   4d52777
+%define	tarname collective-%{module}-%{gitid}
 
 Name:		python-%{module}
 Version:	2.2
-Release:	2
-Summary:	Parser/generator of iCalendar files package for Python
+Release:	1
+Summary:	Python parser/generator of iCalendar files package
 Group:		Development/Languages/Python
 License:	LGPL
-URL:		http://pypi.python.org/pypi/icalendar/2.2
+URL:		https://github.com/collective/icalendar
 AutoReqProv:    on
-Source0:	%{module}-%{version}.tar.gz
+Source0:	%{tarname}.tar.bz2
+Source100:	%{name}-rpmlintrc
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:  python-devel python-setuptools update-alternatives
-#BuildArch:	noarch
-%py_requires
+BuildRequires:  python-distribute python-Sphinx fdupes
+%{py_requires}
+%if 0%{?suse_version} >= 1120
+BuildArch: noarch
+%endif
 
 %description
 The iCalendar package is a parser/generator of iCalendar files for use
 with Python. It follows the RFC 2445 (iCalendar) specification.
 
+%package doc
+Summary:        Python parser/generator of iCalendar files package
+Group:          Development/Languages/Python
+Requires:       %{name} = %{version}
+
+%description doc
+Documentation for package {name}, a python parser/generator of iCalendar files
+package.
+
 %prep
-%setup -q -n collective-%{module}-1b25cdd
+%setup -q -n %{tarname}
 
 %build
-env CFLAGS="%{optflags}" %__python setup.py build
+python setup.py build
+pushd docs
+make html
+rm -rf _build/html/.buildinfo
+mv _build/html ../
+popd
 
 %install
-%__python setup.py install --prefix=%{_prefix} --root=%{buildroot} --record-rpm=INSTALLED_FILES
+python setup.py install --prefix=%{_prefix} --root=%{buildroot} --record-rpm=INSTALLED_FILES
+mkdir -p %{buildroot}/%{_defaultdocdir}/%{name}
+install -m644 *.txt README.rst %{buildroot}/%{_defaultdocdir}/%{name}/
+cp -r html %{buildroot}/%{_defaultdocdir}/%{name}/
+%fdupes -s %{buildroot}/%{_defaultdocdir}/%{name}
 
 %clean
-%__rm -rf %{buildroot}
+rm -rf %{buildroot}
  
 %files -f INSTALLED_FILES
 %defattr(-,root,root)
+%defattr(-, root, root)
+%dir %{_defaultdocdir}/%{name}
+%{_defaultdocdir}/%{name}/CREDITS.txt
+%{_defaultdocdir}/%{name}/README.rst
 
-%doc CHANGES.txt CREDITS.txt HISTORY.txt INSTALL.txt MANIFEST.in README.rst TODO.txt
-%doc docs/
+%files doc
+%defattr(-, root, root)
+%{_defaultdocdir}/%{name}/CHANGES.txt
+%{_defaultdocdir}/%{name}/HISTORY.txt
+%{_defaultdocdir}/%{name}/INSTALL.txt
+%{_defaultdocdir}/%{name}/TODO.txt
+%{_defaultdocdir}/%{name}/html
 
 %changelog