diff --git a/.gitignore b/.gitignore
index 2a99bb3..b94bd65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-rsync-3.0.7.tar.gz
-rsync-patches-3.0.7.tar.gz
+rsync-3.0.8.tar.gz
+rsync-patches-3.0.8.tar.gz
diff --git a/rsync.spec b/rsync.spec
index 355af0a..35d612a 100644
--- a/rsync.spec
+++ b/rsync.spec
@@ -6,16 +6,14 @@
 
 Summary: A program for synchronizing files over a network
 Name: rsync
-Version: 3.0.7
-Release: 4%{?prerelease}%{?dist}
+Version: 3.0.8
+Release: 1%{?prerelease}%{?dist}
 Group: Applications/Internet
 URL: http://rsync.samba.org/
 
 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
-# https://bugzilla.samba.org/show_bug.cgi?id=7057
-Patch0: rsync-3.0.7-buf-overflow.patch
 BuildRequires: libacl-devel, libattr-devel, autoconf, popt-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPLv3+
@@ -48,7 +46,6 @@ patch -p1 -i patches/xattrs.diff
 
 #Enable --copy-devices parameter
 patch -p1 -i patches/copy-devices.diff
-%patch0 -p1 -b .buf-overflow
 
 %build
 rm -fr autom4te.cache
@@ -77,6 +74,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
+* Tue Mar 29 2011 Vojtech Vitek <vvitek@redhat.com> - 3.0.8-1
+- Rebase to 3.0.8, remove buffer overflow patch
+  Resolves: #691362, #675036
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 004ddf2..a9a2c2b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b53525900817cf1ba7ad3a516ab5bfe9  rsync-3.0.7.tar.gz
-48222e00a9a75873aee3bfceb2b2aa41  rsync-patches-3.0.7.tar.gz
+0ee8346ce16bdfe4c88a236e94c752b4  rsync-3.0.8.tar.gz
+6e5e87d27a2bb2ce7872ca77ff68d7ec  rsync-patches-3.0.8.tar.gz