diff --git a/.cvsignore b/.cvsignore
index b8006af..2a3acab 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pure-ftpd-1.0.21.tar.bz2
+pure-ftpd-1.0.29.tar.bz2
diff --git a/pure-ftpd-1.0.20-libdir.patch b/pure-ftpd-1.0.20-libdir.patch
deleted file mode 100644
index 77b6c86..0000000
--- a/pure-ftpd-1.0.20-libdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./configure.libdir	2004-06-20 19:41:54.000000000 +0200
-+++ ./configure	2005-01-31 12:33:03.901660331 +0100
-@@ -19781,8 +19781,8 @@
-       LDFLAGS="$LDFLAGS -L${withval}/lib -L${withval}/lib/mysql -L${withval}/mysql/lib"
-       CPPFLAGS="$CPPFLAGS -I${withval}/include -I${withval}/include/mysql -I${withval}/mysql/include"
-     else
--      LD_RUN_PATH="/usr/local/mysql/lib:/usr/local/mysql/lib/mysql:/usr/lib/mysql:/usr/mysql/lib:/usr/mysql/lib/mysql:/usr/local/lib/mysql:${LD_RUN_PATH:+:}${LD_RUN_PATH}"
--      LDFLAGS="$LDFLAGS -L/usr/local/mysql/lib -L/usr/lib/mysql -L/usr/mysql/lib -L/usr/local/lib/mysql -L/usr/local/mysql/lib/mysql -L/usr/mysql/lib/mysql"
-+      LD_RUN_PATH="/usr/local/mysql/lib:/usr/local/mysql/lib/mysql:${libdir}/mysql:/usr/mysql/lib:/usr/mysql/lib/mysql:/usr/local/lib/mysql:${LD_RUN_PATH:+:}${LD_RUN_PATH}"
-+      LDFLAGS="$LDFLAGS -L/usr/local/mysql/lib -L${libdir}/mysql -L/usr/mysql/lib -L/usr/local/lib/mysql -L/usr/local/mysql/lib/mysql -L/usr/mysql/lib/mysql"
-       CPPFLAGS="$CPPFLAGS -I/usr/local/mysql/include -I/usr/include/mysql -I/usr/mysql/include -I/usr/local/include/mysql -I/usr/local/mysql/include/mysql -I/usr/mysql/include/mysql"
-     fi
- 
diff --git a/pure-ftpd-1.0.21-utime.patch b/pure-ftpd-1.0.21-utime.patch
deleted file mode 100644
index f2a2721..0000000
--- a/pure-ftpd-1.0.21-utime.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pure-ftpd-1.0.21.orig/src/ftpd.c	2009-04-30 13:39:37.000000000 +0300
-+++ pure-ftpd-1.0.21/src/ftpd.c	2009-04-30 13:40:55.000000000 +0300
-@@ -2541,7 +2541,7 @@
-     tm.tm_mon--;
-     tm.tm_year -= 1900;
-     if (tm.tm_mon < 0 || tm.tm_year <= 0 ||
--	(ts = mktime(&tm)) == (time_t) -1) {
-+	(ts = timegm(&tm)) == (time_t) -1) {
- 	addreply_noformat(501, MSG_TIMESTAMP_FAILURE);
- 	return;
-     }
diff --git a/pure-ftpd.spec b/pure-ftpd.spec
index dd1f33d..d28e60d 100644
--- a/pure-ftpd.spec
+++ b/pure-ftpd.spec
@@ -1,12 +1,12 @@
 Name:       pure-ftpd
-Version:    1.0.21
-Release:    16%{?dist}
+Version:    1.0.29
+Release:    1%{?dist}.1
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
 License:    BSD
 URL:        http://www.pureftpd.org
-Source0:    http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.21.tar.bz2
+Source0:    http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-%{version}.tar.bz2
 Source1:    pure-ftpd.init 
 Source2:    pure-ftpd.logrotate
 Source3:    pure-ftpd.xinetd
@@ -14,10 +14,8 @@ Source4:    pure-ftpd.pure-ftpwho.pam
 Source5:    pure-ftpd.pure-ftpwho.consoleapp
 Source6:    pure-ftpd.README.SELinux
 Source7:    pure-ftpd.pureftpd.te
-Patch0:     pure-ftpd-1.0.21-config.patch
-Patch1:     pure-ftpd-1.0.20-libdir.patch
+Patch0:     pure-ftpd-1.0.27-config.patch
 Patch2:     pure-ftpd-paminclude.patch
-Patch3:     pure-ftpd-1.0.21-utime.patch
 Provides:   ftpserver
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pam-devel, perl, python, libcap-devel
@@ -73,9 +71,7 @@ Pure-FTPd to be protected in the same way other FTP servers are in Fedora
 %prep
 %setup -q
 %patch0 -p0 -b .config
-%patch1 -p0 -b .libdir
 %patch2 -p0 -b .paminclude
-%patch3 -p1 -b .utime
 install -pm 644 %{SOURCE6} README.SELinux
 mkdir selinux
 cp -p %{SOURCE7} selinux/pureftpd.te
@@ -208,15 +204,15 @@ fi
 %post selinux
 if [ "$1" -le "1" ]; then # Fist install
     semodule -i %{_datadir}/selinux/packages/%{name}/pureftpd.pp 2>/dev/null || :
-    fixfiles -R pure-ftpd restore
-    /sbin/service pure-ftpd condrestart > /dev/null 2>&1 
+    fixfiles -R pure-ftpd restore || :
+    /sbin/service pure-ftpd condrestart > /dev/null 2>&1 || :
 fi
 
 %preun selinux
 if [ "$1" -lt "1" ]; then # Final removal
     semodule -r pureftpd 2>/dev/null || :
-    fixfiles -R pure-ftpd restore
-    /sbin/service pure-ftpd condrestart > /dev/null 2>&1 
+    fixfiles -R pure-ftpd restore || :
+    /sbin/service pure-ftpd condrestart > /dev/null 2>&1 || :
 fi
 
 %postun selinux
@@ -232,7 +228,7 @@ fi
 %defattr(-, root, root, -)
 %doc FAQ THANKS README.Authentication-Modules README.Virtual-Users README
 %doc README.Contrib README.Configuration-File AUTHORS CONTACT HISTORY NEWS
-%doc README.LDAP README.PGSQL README.MySQL README.Netfilter
+%doc README.LDAP README.PGSQL README.MySQL README.Donations README.TLS
 %doc contrib/pure-vpopauth.pl pureftpd.schema contrib/pure-stat.pl
 %{_bindir}/pure-*
 %{_sbindir}/pure-*
@@ -241,8 +237,8 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
-%config %{_sysconfdir}/pam.d/pure-ftpwho
-%config %{_sysconfdir}/security/console.apps/pure-ftpwho
+%config(noreplace) %{_sysconfdir}/pam.d/pure-ftpwho
+%config(noreplace) %{_sysconfdir}/security/console.apps/pure-ftpwho
 %{!?_without_tls:%{_sysconfdir}/pki/%{name}}
 %{_mandir}/man8/*
 %dir /var/ftp/
@@ -255,6 +251,12 @@ fi
 
 
 %changelog
+* Thu May 13 2010 Lubomir Rintel <lkundrak@v3.sk> - 1.0.29-1.1
+- Bump to a later release (per request from Tristan Santore)
+- Pull Fedora changes:
+- make pam and consolehelper's conf files noreplace (Aurelien Bompard)
+- fix bug #586513 (Aurelien Bompard)
+
 * Fri May 08 2008 Lubomir Rintel <lkundrak@v3.sk> - 1.0.21-16
 - Fix SITE UTIME (Nickolay Bunev, #498431)
 
diff --git a/sources b/sources
index f44164a..468f7da 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ca8a8dbec0cd9c8ea92fc4c37ea9c410  pure-ftpd-1.0.21.tar.bz2
+12a074824b509f9e7684fab333ed6915  pure-ftpd-1.0.29.tar.bz2