diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index f260e3a..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-rss2email.py
-CHANGELOG
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5fe7c04
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+rss2email-2.66.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 2a8b2b6..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: rss2email
-# $Id$
-NAME := rss2email
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/rss2email-config.py.template b/rss2email-config.py.template
deleted file mode 100644
index 3118aef..0000000
--- a/rss2email-config.py.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Find some common used config options below; all can be found all and 
-# descriptions in the section titled "### Vaguely Customizable Options ###"
-# near the top of /usr/share/rss2email/rss2email.py
-
-DEFAULT_FROM="bozo@dev.null.invalid"
-HTML_MAIL=1
-SMTP_SEND=1
-SMTP_SERVER="localhost"
-AUTHREQUIRED=0
-SMTP_USER="username"
-SMTP_PASS="password"
-DATE_HEADER=0
-# PROXY=""
diff --git a/rss2email.spec b/rss2email.spec
index d4a1bc3..e4954d1 100644
--- a/rss2email.spec
+++ b/rss2email.spec
@@ -1,19 +1,18 @@
 Name:           rss2email
-Version:        2.65
-Release:        3.1
+Version:        2.66
+Release:        1%{?dist}
 Summary:        Deliver news from RSS feeds to your smtp server as text or html mail
 
 Group:          Applications/Internet
 License:        GPLv3
-URL:            http://rss2email.infogami.com/
-Source0:        http://rss2email.infogami.com/rss2email.py
-Source1:        http://rss2email.infogami.com/CHANGELOG
-# Fedora variant of http://lindsey.smith.googlepages.com/r2e
+URL:            http://www.allthingsrss.com/rss2email/
+Source0:        http://www.allthingsrss.com/rss2email/rss2email-2.66.tar.gz 
+# Fedora variant of http://lindsey.smith.googlepages.com/r2e , which since 2.66
+# is included in the rss2email tarball
 Source3:        rss2email-r2e
 # man page taken from 
 # http://ftp.debian.org/debian/pool/main/r/rss2email/rss2email_2.60-3.diff.gz
 Source4:        rss2email-r2e.1
-Source5:        rss2email-config.py.template
 Patch0:         rss2email-use-configpy-from-homedir.patch
 BuildArch:      noarch
 
@@ -31,12 +30,10 @@ See the man page r2e for details how to set rss2email up.
 
 
 %prep
-%setup -q -c -T
-install -p -m 0644 %{SOURCE0} rss2email.py
-install -p -m 0644 %{SOURCE1} CHANGELOG.html
+%setup -q
 # let rss2email use ${HOME}/.rss2email/config.py
 %patch0 -b .patch0 
-sed -i -e 's/\r//' CHANGELOG.html rss2email.py
+sed -i -e 's/\r//' CHANGELOG rss2email.py
 
 
 %build
@@ -54,7 +51,7 @@ install -p -m 0755 rss2email.py $RPM_BUILD_ROOT%{_datadir}/%{name}/
 install -p -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/r2e
 sed -i -e 's;/usr/share;%{_datadir};g' $RPM_BUILD_ROOT%{_bindir}/r2e
 install -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1/r2e.1
-install -p -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}/config.py.template
+install -p -m 0644 config.py $RPM_BUILD_ROOT%{_datadir}/%{name}/config.py.template
 
 
 %clean
@@ -63,12 +60,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG.html
+%doc CHANGELOG readme.html
 %{_bindir}/*
 %{_datadir}/%{name}/
 %{_mandir}/man1/*
 
 %changelog
+* Sun Jul 04 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.66-1
+- update to 2.66, which now is shipped in a tarball 
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.65-3.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 81b0b27..9bfa107 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-eff3f5ed82b3ccaa622f06d595b24dba  rss2email.py
-b68f79442af6ba24421ebd663cba9f58  CHANGELOG
+84a7aa98b52952e37dd239fefb01e9d9  rss2email-2.66.tar.gz