diff --git a/vsftpd.changes b/vsftpd.changes
index c6c00ab..570c4b0 100644
--- a/vsftpd.changes
+++ b/vsftpd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 28 08:46:47 CET 2007 - mskibbe@suse.de
+
+- vsftpd - Support for FATE #300687: Ports for SuSEfirewall added
+  via packages (#246932)
+
 -------------------------------------------------------------------
 Mon Jan 15 09:21:58 CET 2007 - mskibbe@suse.de
 
diff --git a/vsftpd.firewall b/vsftpd.firewall
new file mode 100644
index 0000000..0a85d5c
--- /dev/null
+++ b/vsftpd.firewall
@@ -0,0 +1,17 @@
+## Name: vsftpd Server
+## Description: Opens ports for vsftpd Server.
+
+# space separated list of allowed TCP ports
+TCP="ftp ftp-data"
+
+# space separated list of allowed UDP ports
+UDP="ftp-data"
+
+# space separated list of allowed RPC services
+RPC=""
+
+# space separated list of allowed IP protocols
+IP=""
+
+# space separated list of allowed UDP broadcast ports
+BROADCAST=""
diff --git a/vsftpd.spec b/vsftpd.spec
index 78e82b6..9419fbf 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -18,7 +18,7 @@ BuildRequires:  libcap
 BuildRequires:  libcap-devel
 %endif
 Version:        2.0.5
-Release:        33
+Release:        37
 Summary:        Very Secure FTP Daemon - Written from Scratch
 License:        GNU General Public License (GPL)
 Group:          Productivity/Networking/Ftp/Servers
@@ -29,6 +29,7 @@ Source2:        %name.logrotate
 Source3:        %name.init
 Source4:        README.SUSE
 Source5:        %name.xml
+Source6:        %name.firewall
 Patch:          %name-2.0.4-conf.diff
 Patch1:         %name-2.0.4-lib64.diff
 Patch2:         %name-2.0.4-nowarn.patch
@@ -90,6 +91,8 @@ install -D -m 755 %SOURCE3 $RPM_BUILD_ROOT/etc/init.d/%name
 ln -sf ../../etc/init.d/%name $RPM_BUILD_ROOT/%_prefix/sbin/rc%name
 install -d $RPM_BUILD_ROOT/%_datadir/omc/svcinfo.d/
 install -D -m 644 %SOURCE5 $RPM_BUILD_ROOT/%_datadir/omc/svcinfo.d/
+install -d $RPM_BUILD_ROOT%{_datadir}/SuSEfirewall2/services/
+install -m 644 %{S:6} $RPM_BUILD_ROOT%{_datadir}/SuSEfirewall2/services/%{name}
 
 %preun
 %stop_on_removal %name
@@ -119,8 +122,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc INSTALL BUGS AUDIT Changelog LICENSE README README.security
 %doc REWARD SPEED TODO SECURITY TUNING SIZE FAQ EXAMPLE COPYING
 %doc README.SUSE
+%{_datadir}/SuSEfirewall2/services/vsftpd
 
-%changelog -n vsftpd
+%changelog
+* Wed Feb 28 2007 - mskibbe@suse.de
+- vsftpd - Support for FATE #300687: Ports for SuSEfirewall added
+  via packages (#246932)
 * Mon Jan 15 2007 - mskibbe@suse.de
 - fix cryptic symbol in package - description
 - build against libcap on suse < 10.1