diff --git a/.cvsignore b/.cvsignore
index 8960e92..67b1105 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-postfix-2.6.5.tar.gz
 pflogsumm-1.1.2.tar.gz
+postfix-2.7.0.tar.gz
diff --git a/postfix-2.6.1-config.patch b/postfix-2.6.1-config.patch
deleted file mode 100644
index 6bffcc9..0000000
--- a/postfix-2.6.1-config.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff -up postfix-2.6.1/conf/main.cf.config postfix-2.6.1/conf/main.cf
---- postfix-2.6.1/conf/main.cf.config	2007-12-18 14:50:25.000000000 +0100
-+++ postfix-2.6.1/conf/main.cf	2009-05-22 17:04:40.000000000 +0200
-@@ -113,6 +113,10 @@ mail_owner = postfix
- #inet_interfaces = all
- #inet_interfaces = $myhostname
- #inet_interfaces = $myhostname, localhost
-+inet_interfaces = localhost
-+
-+# Enable IPv4, and IPv6 if supported
-+inet_protocols = all
- 
- # The proxy_interfaces parameter specifies the network interface
- # addresses that this mail system receives mail on by way of a
-@@ -157,7 +161,7 @@ mail_owner = postfix
- #
- # See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS".
- #
--#mydestination = $myhostname, localhost.$mydomain, localhost
-+mydestination = $myhostname, localhost.$mydomain, localhost
- #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain
- #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain,
- #	mail.$mydomain, www.$mydomain, ftp.$mydomain
-@@ -379,7 +383,7 @@ unknown_local_recipient_reject_code = 55
- # "postfix reload" to eliminate the delay.
- #
- #alias_maps = dbm:/etc/aliases
--#alias_maps = hash:/etc/aliases
-+alias_maps = hash:/etc/aliases
- #alias_maps = hash:/etc/aliases, nis:mail.aliases
- #alias_maps = netinfo:/aliases
- 
-@@ -390,7 +394,7 @@ unknown_local_recipient_reject_code = 55
- #
- #alias_database = dbm:/etc/aliases
- #alias_database = dbm:/etc/mail/aliases
--#alias_database = hash:/etc/aliases
-+alias_database = hash:/etc/aliases
- #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
- 
- # ADDRESS EXTENSIONS (e.g., user+foo)
-@@ -458,7 +462,29 @@ unknown_local_recipient_reject_code = 55
- # the main.cf file, otherwise the SMTP server will reject mail for    
- # non-UNIX accounts with "User unknown in local recipient table".
- #
--#mailbox_transport = lmtp:unix:/file/name
-+#mailbox_transport = lmtp:unix:/var/lib/imap/socket/lmtp
-+
-+# If using the cyrus-imapd IMAP server deliver local mail to the IMAP
-+# server using LMTP (Local Mail Transport Protocol), this is prefered
-+# over the older cyrus deliver program by setting the
-+# mailbox_transport as below:
-+#
-+# mailbox_transport = lmtp:unix:/var/lib/imap/socket/lmtp
-+#
-+# The efficiency of LMTP delivery for cyrus-imapd can be enhanced via
-+# these settings.
-+#
-+# local_destination_recipient_limit = 300
-+# local_destination_concurrency_limit = 5
-+#
-+# Of course you should adjust these settings as appropriate for the
-+# capacity of the hardware you are using. The recipient limit setting
-+# can be used to take advantage of the single instance message store
-+# capability of Cyrus. The concurrency limit can be used to control
-+# how many simultaneous LMTP sessions will be permitted to the Cyrus
-+# message store. 
-+#
-+# To use the old cyrus deliver program you have to set:
- #mailbox_transport = cyrus
- 
- # The fallback_transport specifies the optional transport in master.cf
-@@ -475,8 +501,7 @@ unknown_local_recipient_reject_code = 55
- # the main.cf file, otherwise the SMTP server will reject mail for    
- # non-UNIX accounts with "User unknown in local recipient table".
- #
--#fallback_transport = lmtp:unix:/file/name
--#fallback_transport = cyrus
-+#fallback_transport = lmtp:unix:/var/lib/imap/socket/lmtp
- #fallback_transport =
- 
- # The luser_relay parameter specifies an optional destination address
-diff -up postfix-2.6.1/conf/master.cf.config postfix-2.6.1/conf/master.cf
---- postfix-2.6.1/conf/master.cf.config	2008-01-30 12:57:57.000000000 +0100
-+++ postfix-2.6.1/conf/master.cf	2009-05-22 16:38:30.000000000 +0200
-@@ -68,7 +68,7 @@ scache    unix  -       -       n       
- # The Cyrus deliver program has changed incompatibly, multiple times.
- #
- #old-cyrus unix  -       n       n       -       -       pipe
--#  flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
-+#  flags=R user=cyrus argv=/usr/lib/cyrus-imapd/deliver -e -m ${extension} ${user}
- #
- # ====================================================================
- #
-@@ -76,7 +76,7 @@ scache    unix  -       -       n       
- # Also specify in main.cf: cyrus_destination_recipient_limit=1
- #
- #cyrus     unix  -       n       n       -       -       pipe
--#  user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
-+#  user=cyrus argv=/usr/lib/cyrus-imapd/deliver -e -r ${sender} -m ${extension} ${user}
- #
- # ====================================================================
- #
diff --git a/postfix-2.7.0-config.patch b/postfix-2.7.0-config.patch
new file mode 100644
index 0000000..ea8caf8
--- /dev/null
+++ b/postfix-2.7.0-config.patch
@@ -0,0 +1,102 @@
+diff -up postfix-2.7.0/conf/main.cf.config postfix-2.7.0/conf/main.cf
+--- postfix-2.7.0/conf/main.cf.config	2007-12-18 14:50:25.000000000 +0100
++++ postfix-2.7.0/conf/main.cf	2010-02-26 12:28:14.000000000 +0100
+@@ -113,6 +113,10 @@ mail_owner = postfix
+ #inet_interfaces = all
+ #inet_interfaces = $myhostname
+ #inet_interfaces = $myhostname, localhost
++inet_interfaces = localhost
++
++# Enable IPv4, and IPv6 if supported
++inet_protocols = all
+ 
+ # The proxy_interfaces parameter specifies the network interface
+ # addresses that this mail system receives mail on by way of a
+@@ -157,7 +161,7 @@ mail_owner = postfix
+ #
+ # See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS".
+ #
+-#mydestination = $myhostname, localhost.$mydomain, localhost
++mydestination = $myhostname, localhost.$mydomain, localhost
+ #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain
+ #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain,
+ #	mail.$mydomain, www.$mydomain, ftp.$mydomain
+@@ -379,7 +383,7 @@ unknown_local_recipient_reject_code = 55
+ # "postfix reload" to eliminate the delay.
+ #
+ #alias_maps = dbm:/etc/aliases
+-#alias_maps = hash:/etc/aliases
++alias_maps = hash:/etc/aliases
+ #alias_maps = hash:/etc/aliases, nis:mail.aliases
+ #alias_maps = netinfo:/aliases
+ 
+@@ -390,7 +394,7 @@ unknown_local_recipient_reject_code = 55
+ #
+ #alias_database = dbm:/etc/aliases
+ #alias_database = dbm:/etc/mail/aliases
+-#alias_database = hash:/etc/aliases
++alias_database = hash:/etc/aliases
+ #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
+ 
+ # ADDRESS EXTENSIONS (e.g., user+foo)
+@@ -458,7 +462,29 @@ unknown_local_recipient_reject_code = 55
+ # the main.cf file, otherwise the SMTP server will reject mail for    
+ # non-UNIX accounts with "User unknown in local recipient table".
+ #
+-#mailbox_transport = lmtp:unix:/file/name
++#mailbox_transport = lmtp:unix:/var/lib/imap/socket/lmtp
++
++# If using the cyrus-imapd IMAP server deliver local mail to the IMAP
++# server using LMTP (Local Mail Transport Protocol), this is prefered
++# over the older cyrus deliver program by setting the
++# mailbox_transport as below:
++#
++# mailbox_transport = lmtp:unix:/var/lib/imap/socket/lmtp
++#
++# The efficiency of LMTP delivery for cyrus-imapd can be enhanced via
++# these settings.
++#
++# local_destination_recipient_limit = 300
++# local_destination_concurrency_limit = 5
++#
++# Of course you should adjust these settings as appropriate for the
++# capacity of the hardware you are using. The recipient limit setting
++# can be used to take advantage of the single instance message store
++# capability of Cyrus. The concurrency limit can be used to control
++# how many simultaneous LMTP sessions will be permitted to the Cyrus
++# message store. 
++#
++# To use the old cyrus deliver program you have to set:
+ #mailbox_transport = cyrus
+ 
+ # The fallback_transport specifies the optional transport in master.cf
+@@ -475,8 +501,7 @@ unknown_local_recipient_reject_code = 55
+ # the main.cf file, otherwise the SMTP server will reject mail for    
+ # non-UNIX accounts with "User unknown in local recipient table".
+ #
+-#fallback_transport = lmtp:unix:/file/name
+-#fallback_transport = cyrus
++#fallback_transport = lmtp:unix:/var/lib/imap/socket/lmtp
+ #fallback_transport =
+ 
+ # The luser_relay parameter specifies an optional destination address
+diff -up postfix-2.7.0/conf/master.cf.config postfix-2.7.0/conf/master.cf
+--- postfix-2.7.0/conf/master.cf.config	2010-02-03 22:01:27.000000000 +0100
++++ postfix-2.7.0/conf/master.cf	2010-02-26 12:31:55.000000000 +0100
+@@ -80,14 +80,14 @@ scache    unix  -       -       n       
+ # Also specify in main.cf: cyrus_destination_recipient_limit=1
+ #
+ #cyrus     unix  -       n       n       -       -       pipe
+-#  user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
++#  user=cyrus argv=/usr/lib/cyrus-imapd/deliver -e -r ${sender} -m ${extension} ${user}
+ #
+ # ====================================================================
+ #
+ # Old example of delivery via Cyrus.
+ #
+ #old-cyrus unix  -       n       n       -       -       pipe
+-#  flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
++#  flags=R user=cyrus argv=/usr/lib/cyrus-imapd/deliver -e -m ${extension} ${user}
+ #
+ # ====================================================================
+ #
diff --git a/postfix.spec b/postfix.spec
index ad9a55f..201e09e 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -39,8 +39,8 @@
 
 Name: postfix
 Summary: Postfix Mail Transport Agent
-Version: 2.6.5
-Release: 3%{?dist}
+Version: 2.7.0
+Release: 1%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -74,7 +74,7 @@ Source101: postfix-pam.conf
 
 # Patches
 
-Patch1: postfix-2.6.1-config.patch
+Patch1: postfix-2.7.0-config.patch
 Patch2: postfix-2.6.1-files.patch
 Patch3: postfix-alternatives.patch
 Patch8: postfix-large-fs.patch
@@ -499,6 +499,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Feb 26 2010 Miroslav Lichvar <mlichvar@redhat.com> 2:2.7.0-1
+- update to 2.7.0
+
 * Fri Jan 29 2010 Miroslav Lichvar <mlichvar@redhat.com> 2:2.6.5-3
 - fix init script LSB compliance (#528151)
 - update pflogsumm to 1.1.2
diff --git a/sources b/sources
index 7eaf4c7..9ceba8a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-6b954cfb3eb6141dac1e773281211717  postfix-2.6.5.tar.gz
 c6bb433444a83564101aa30259cc849b  pflogsumm-1.1.2.tar.gz
+df648f59421604e895cce56325f00bae  postfix-2.7.0.tar.gz