diff --git a/.cvsignore b/.cvsignore
index ba1268d..66b14c7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -10,3 +10,4 @@ postfix-2.4.3.tar.gz
 postfix-2.4.5.tar.gz
 postfix-2.4.6.tar.gz
 postfix-2.5.1.tar.gz
+postfix-2.5.5.tar.gz
diff --git a/postfix.spec b/postfix.spec
index b16687c..67704c5 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -39,8 +39,8 @@
 
 Name: postfix
 Summary: Postfix Mail Transport Agent
-Version: 2.5.1
-Release: 4%{?dist}
+Version: 2.5.5
+Release: 1%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -81,7 +81,6 @@ Patch7: postfix-2.1.5-aliases.patch
 Patch8: postfix-large-fs.patch
 Patch9: postfix-2.4.0-cyrus.patch
 Patch10: postfix-2.4.5-open_define.patch
-Patch11: postfix-CVE-2008-2936.patch
 
 # Optional patches - set the appropriate environment variables to include
 #                    them when building the package/spec file
@@ -140,7 +139,6 @@ TLS
 %patch8 -p1 -b .large-fs
 %patch9 -p1 -b .cyrus
 %patch10 -p1 -b .open_define
-%patch11 -p1 -b .CVE-2008-2936
 
 # resolve multilib conflict for makedefs.out: rename to makedefs.out-%{_arch}
 perl -pi -e "s/makedefs.out/makedefs.out-%{_arch}/g" conf/postfix-files Makefile.in */Makefile.in */*/Makefile.in HISTORY
@@ -482,6 +480,10 @@ exit 0
 
 
 %changelog
+* Wed Sep 17 2008 Thomas Woerner <twoerner@redhat.com> 2:2.5.5-1
+- new version 2.5.5
+  fixes CVE-2008-2936, CVE-2008-2937 and CVE-2008-3889 (rhbz#459101)
+
 * Thu Aug 28 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2:2.5.1-4
 - fix license tag
 
diff --git a/sources b/sources
index 667f760..2bda7dc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 1f78fcaf2a36ec3520ecff286a45251a  pflogsumm-1.1.0.tar.gz
-95a559c509081fdd07d78eafd4f4c3b4  postfix-2.5.1.tar.gz
+6b4b848bdd2239dddfc9d385e57e19ef  postfix-2.5.5.tar.gz