diff --git a/.gitignore b/.gitignore
index a25fec1..263c065 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 vsftpd-2.2.2.tar.gz
 vsftpd-2.3.2.tar.gz
 /vsftpd-2.3.4.tar.gz
+/vsftpd-2.3.5.tar.gz
diff --git a/sources b/sources
index 1725ccc..022d563 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2ea5d19978710527bb7444d93b67767a  vsftpd-2.3.4.tar.gz
+01398a5bef8e85b6cf2c213a4b011eca  vsftpd-2.3.5.tar.gz
diff --git a/vsftpd-2.3.4-tout.patch b/vsftpd-2.3.4-tout.patch
deleted file mode 100644
index 82ba294..0000000
--- a/vsftpd-2.3.4-tout.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- vsftpd-2.3.4/sysutil.c.tout	2011-06-28 23:12:21.134196123 +0530
-+++ vsftpd-2.3.4/sysutil.c	2011-06-28 23:48:20.622197105 +0530
-@@ -1831,6 +1831,12 @@ vsf_sysutil_connect_timeout(int fd, cons
-       {
-         die("getsockopt");
-       }
-+
-+      if (retval != 0)
-+      {
-+        errno = retval;
-+	retval = -1;
-+      }
-     }
-   }
-   if (wait_seconds > 0)
diff --git a/vsftpd.spec b/vsftpd.spec
index 525d0ec..046ad38 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -1,8 +1,8 @@
 %{!?tcp_wrappers:%define tcp_wrappers 1}
 
 Name: vsftpd
-Version: 2.3.4
-Release: 7%{?dist}
+Version: 2.3.5
+Release: 1%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -51,7 +51,6 @@ Patch13: vsftpd-2.2.0-openssl.patch
 Patch14: vsftpd-2.2.0-wildchar.patch
 
 Patch16: vsftpd-2.2.2-clone.patch
-Patch18: vsftpd-2.3.4-tout.patch
 Patch19: vsftpd-2.3.4-sd.patch
 Patch20: vsftpd-2.3.4-sqb.patch
 Patch21: vsftpd-2.3.4-listen_ipv6.patch
@@ -89,7 +88,6 @@ cp %{SOURCE1} .
 %patch13 -p1 -b .openssl
 %patch14 -p1 -b .wildchar
 %patch16 -p1 -b .clone
-%patch18 -p1 -b .tout
 %patch19 -p1 -b .sd
 %patch20 -p1 -b .sqb
 %patch21 -p1 -b .listen_ipv6
@@ -167,6 +165,9 @@ fi
 %{_sysconfdir}/rc.d/init.d/vsftpd
 
 %changelog
+* Mon Dec 19 2011 Jiri Skala <jskala@redhat.com> - 2.3.5-1
+- updated to latest upstream 2.3.5
+
 * Mon Nov 28 2011 Jiri Skala <jskala@redhat.com> - 2.3.4-7
 - added patch from BZ#450853#c23