diff --git a/yast2-firewall-2.19.0.tar.bz2 b/yast2-firewall-2.19.0.tar.bz2
deleted file mode 100644
index c13d809..0000000
--- a/yast2-firewall-2.19.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9aacef507035dacfe779c3c1de1bc79c9f36e35ddd9a293f2c1cf48386681796
-size 112981
diff --git a/yast2-firewall-2.21.0.tar.bz2 b/yast2-firewall-2.21.0.tar.bz2
new file mode 100644
index 0000000..46ecc7f
--- /dev/null
+++ b/yast2-firewall-2.21.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d2de09dc52df294d723d09a28c84308bebb9e924796e883d3463ee23fd4435cd
+size 116296
diff --git a/yast2-firewall.changes b/yast2-firewall.changes
index 377c696..2fe24ad 100644
--- a/yast2-firewall.changes
+++ b/yast2-firewall.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Fri Aug 26 13:33:57 CEST 2011 - locilka@suse.cz
+
+- Fixed Custom Rules dialog to handle additional flags (bnc#712670)
+- 2.21.0
+
+-------------------------------------------------------------------
+Fri Aug  5 12:32:00 CEST 2011 - tgoettlicher@suse.de
+
+- fixed .desktop file (bnc #681249)
+
+-------------------------------------------------------------------
+Fri Apr  2 15:24:40 CEST 2010 - locilka@suse.cz
+
+- Added missing help for accepting-broadcast-reply (BNC #583046).
+- Fixed HTML in help text (BNC #595204).
+- 2.19.1
+
+-------------------------------------------------------------------
+Wed Jan 13 18:56:03 CET 2010 - kmachalkova@suse.cz
+
+- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su
+  where root privileges are needed, removed X-KDE-SubstituteUID key 
+  (bnc#540627)
+
 -------------------------------------------------------------------
 Thu Nov 26 19:20:16 CET 2009 - kmachalkova@suse.cz
 
diff --git a/yast2-firewall.spec b/yast2-firewall.spec
index 51e2780..a3047bf 100644
--- a/yast2-firewall.spec
+++ b/yast2-firewall.spec
@@ -1,56 +1,52 @@
 #
-# spec file for package yast2-firewall (Version 2.19.0)
+# spec file for package yast2-firewall (Version 2.21.0)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
 # norootforbuild
 
+Name:		yast2-firewall
+Version:	2.21.0
+Release:	0
+
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-build
+Source0:	yast2-firewall-2.21.0.tar.bz2
+
+prefix:		/usr
+
+Group:	System/YaST
+License: GPL v2 or later
+BuildRequires:	perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite
+BuildRequires:	yast2 >= 2.16.47
 
-Name:           yast2-firewall
-Version:        2.19.0
-Release:        1
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-firewall-2.19.0.tar.bz2
-Prefix:         /usr
-Group:          System/YaST
-License:        GPLv2+
-BuildRequires:  perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite
-BuildRequires:  yast2 >= 2.16.47
 # Netmask::CheckPrefix4
-Requires:       yast2 >= 2.18.26
+Requires:	yast2 >= 2.18.26
+
 # ButtonBox widget
-Conflicts:      yast2-ycp-ui-bindings < 2.17.3
-Provides:       yast2-config-firewall
-Obsoletes:      yast2-config-firewall
-Provides:       yast2-trans-firewall
-Obsoletes:      yast2-trans-firewall
-BuildArch:      noarch
-Summary:        YaST2 - Firewall Configuration
+Conflicts:	yast2-ycp-ui-bindings < 2.17.3
+
+Provides:	yast2-config-firewall
+Obsoletes:	yast2-config-firewall
+Provides:	yast2-trans-firewall
+Obsoletes:	yast2-trans-firewall
+
+BuildArchitectures:	noarch
+
+Summary:	YaST2 - Firewall Configuration
 
 %description
 A YaST2 module to be used for configuring a firewall.
 
 %prep
-%setup -n yast2-firewall-2.19.0
+%setup -n yast2-firewall-2.21.0
 
 %build
 %{prefix}/bin/y2tool y2autoconf
 %{prefix}/bin/y2tool y2automake
 autoreconf --force --install
+
 export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
 export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
+
 %{?suse_update_config:%{suse_update_config -f}}
 ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
 # V=1: verbose build in case we used AM_SILENT_RULES(yes)
@@ -65,6 +61,7 @@ for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desk
     %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
 done
 
+
 %clean
 rm -rf "$RPM_BUILD_ROOT"
 
@@ -77,4 +74,3 @@ rm -rf "$RPM_BUILD_ROOT"
 %{prefix}/share/applications/YaST2/firewall.desktop
 /usr/share/YaST2/schema/autoyast/rnc/firewall.rnc
 %doc %{prefix}/share/doc/packages/yast2-firewall
-%changelog