diff --git a/.cvsignore b/.cvsignore
index 804e27f..b33f95d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-rsync-3.0.5.tar.gz
-rsync-patches-3.0.5.tar.gz
+rsync-3.0.6pre1.tar.gz
+rsync-patches-3.0.6pre1.tar.gz
diff --git a/rsync.spec b/rsync.spec
index 3f39eac..6145617 100644
--- a/rsync.spec
+++ b/rsync.spec
@@ -1,14 +1,18 @@
+%define isprerelease 1
+
+%if %isprerelease
+%define prerelease pre1
+%endif
+
 Summary: A program for synchronizing files over a network
 Name: rsync
-Version: 3.0.5
-Release: 1%{?dist}
+Version: 3.0.6
+Release: 0%{?prerelease}%{?dist}
 Group: Applications/Internet
 URL: http://rsync.samba.org/
-# TAG: for pre versions use
-#Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre3.tar.gz
-Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz
-#Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}pre3.tar.gz
-Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}.tar.gz
+
+Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}%{?prerelease}.tar.gz
+Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}%{?prerelease}.tar.gz
 Source2: rsync.xinetd
 BuildRequires: libacl-devel, libattr-devel, autoconf, popt-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -25,10 +29,14 @@ package.
 
 %prep
 # TAG: for pre versions use
-#%setup -q -n rsync-%{version}pre3
+
+%if %isprerelease
+%setup -q -n rsync-%{version}%{?prerelease}
+%setup -q -b 1 -n rsync-%{version}%{?prerelease}
+%else
 %setup -q
-#%setup -q -b 1 -n rsync-%{version}pre3
 %setup -q -b 1
+%endif
 
 chmod -x support/*
 
@@ -63,6 +71,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
+* Wed Apr 15 2009 Simo Sorce <ssorce@redhat.com> 3.0.6-0pre1
+- First 3.0.6 pre release
+- Also change the spec to simplify releasing pre-releases
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.5-1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index 3bbb7f7..376e71d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a130e736c011572cb423b6245e97fc4b  rsync-3.0.5.tar.gz
-ada27361a483f7366b9bb3dab4cba0d0  rsync-patches-3.0.5.tar.gz
+46183b8ba930c846551e04736eec9515  rsync-3.0.6pre1.tar.gz
+695ae8cc0a852eed5b3a3af62c850c2e  rsync-patches-3.0.6pre1.tar.gz