diff --git a/postfix-SuSE.tar.gz b/postfix-SuSE.tar.gz
index b19c421..528c9f3 100644
--- a/postfix-SuSE.tar.gz
+++ b/postfix-SuSE.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0909d617691af09eed56606dbb667903577927beb4adc708fd9dee9cb7858740
-size 16484
+oid sha256:66796243a9872fe87d633ea8a192c09569ac0edb1ac78d13ca1be4364a3a3f8c
+size 17423
diff --git a/postfix.changes b/postfix.changes
index 875bbc5..d8dae89 100644
--- a/postfix.changes
+++ b/postfix.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb 26 10:32:36 CET 2007 - varkoly@suse.de
+
+- #247351 - postfix - Ports for SuSEfirewall added via packages
+
+- Move postfix.xml into the postfix-SuSE tarball
+
 -------------------------------------------------------------------
 Mon Jan 15 13:14:07 CET 2007 - varkoly@suse.de
 
diff --git a/postfix.spec b/postfix.spec
index 5e6cfe2..33e6fbc 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -22,10 +22,9 @@ Conflicts:      sendmail exim
 Autoreqprov:    on
 Summary:        A fast, secure, and flexible mailer
 Version:        2.3.2
-Release:        34
+Release:        37
 Source:         postfix-%{version}.tar.gz
 Source1:        postfix-SuSE.tar.gz
-Source2:        postfix.xml
 Patch:          dynamic_maps.patch
 Patch1:         dynamic_maps_pie.patch
 Prereq:         /usr/sbin/useradd /usr/sbin/groupadd %insserv_prereq %fillup_prereq /bin/sed /bin/awk /bin/grep textutils sh-utils fileutils pcre openldap2-client netcfg /sbin/ip
@@ -187,7 +186,9 @@ install -m 755 postfix-SuSE/mkpostfixcert $RPM_BUILD_ROOT/usr/sbin/mkpostfixcert
 rm -rf $RPM_BUILD_ROOT/var/spool/postfix
 install -m 644 postfix-SuSE/master.cf $RPM_BUILD_ROOT/%{conf_backup_dir}/master.cf
 mkdir   -p $RPM_BUILD_ROOT/%{omc_dir}
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{omc_dir}
+install -m 644 postfix-SuSE/postfix.xml $RPM_BUILD_ROOT/%{omc_dir}
+mkdir -p  $RPM_BUILD_ROOT/usr/share/SuSEfirewall2/services/
+install -m 644 postfix-SuSE/postfix-fw $RPM_BUILD_ROOT/usr/share/SuSEfirewall2/services/postfix
 {
 cat<<EOF
 #
@@ -491,6 +492,7 @@ fi
 %config(noreplace) /etc/postfix/header_checks
 %config(noreplace) /etc/postfix/bounce.cf.default
 %config(noreplace) /etc/postfix/dynamicmaps.cf
+%config(noreplace) /usr/share/SuSEfirewall2/services/postfix
 %dir /etc/sasl2/
 %config(noreplace) /etc/sasl2/smtpd.conf
 /etc/postfix/LICENSE
@@ -567,7 +569,10 @@ Authors:
     Wietse Venema <wietse@porcupine.org>
 
 
-%changelog -n postfix
+%changelog
+* Mon Feb 26 2007 - varkoly@suse.de
+- #247351 - postfix - Ports for SuSEfirewall added via packages
+- Move postfix.xml into the postfix-SuSE tarball
 * Mon Jan 15 2007 - varkoly@suse.de
 - #144104 - postfix does not start
 - Implementing Fate #301840: Postfix XML Service Description Document
diff --git a/postfix.xml b/postfix.xml
deleted file mode 100644
index bc0f6da..0000000
--- a/postfix.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Sample Service Description XML Document.
-	
-This file should be placed in /etc/omc/svcinfo.d
-It should be named <service name>.xml. The reason for the naming scheme,
-is that other services can refer to this service in their dependency list using
-the file name minus the '.xml' extension.
-
-Note: The name of the service is the name of this file without the .xml
-file extension.
- -->
-
-<serviceDescription version="1.0">
-
-	<!-- Caption for display purposes -->
-	<caption>Postfix Mail Server</caption>
-
-	<!-- Description of this service -->
-	<description>
-		Postfix is a fast, secure, and flexible mailer.
-		Postfix aims to be an alternative to the widely-used sendmail program.
-	</description>
-
-	<!--
-		Define the services that this service has a dependency on.
-		There must be a corresponding Service Description XML file
-		for the antecedent service in the /etc/omc/svcinfo.d directory.
-	-->
-	<dependsOn>
-		<serviceName>network</serviceName>
-		<serviceName>syslog</serviceName>
-	</dependsOn>
-
-	<!--
-		The startCommand tag specifies the command line that will be
-		invoked to start the service. The return code from this command
-		must be as follows:
-			0 - success
-			1 - generic or unspecified error
-			2 - invalid or excess argument(s)
-			3 - unimplemented feature (e.g. "reload")
-			4 - user had insufficient privileges
-			5 - program is not installed
-			6 - program is not configured
-			7 - program is not running
-	-->
-	<startCommand>/usr/sbin/postfix start</startCommand>
-
-	<!--
-		The reStartCommand tag specifies the command line that will be
-		invoked to restart the service. The return code from this command
-		must be as specified in the startCommand tag.
-	-->
-	<reStartCommand>/usr/sbin/postfix restart</reStartCommand>
-
-	<!--
-		The stopCommand tag specifies the command line that will be
-		invoked to stop the service. The return code from this command
-		must be as specified in the startCommand tag.
-	-->
-	<stopCommand>/usr/sbin/postfix stop</stopCommand>
-
-	<!--
-		The statusCommand specifies the command line that can be run
-		that will report on the status of the service. The return code
-		from this command line should be as follows:
-			0 - service up and running
-			1 - service dead, but /var/run/  pid  file exists
-			2 - service dead, but /var/lock/ lock file exists
-			3 - service not running (unused)
-			4 - service status unknown :-(
-	-->
-	<statusCommand>/etc/init.d/postfix status</statusCommand>
-
-</serviceDescription>
-