diff --git a/yast2-firewall-2.21.1.tar.bz2 b/yast2-firewall-2.21.1.tar.bz2
deleted file mode 100644
index dd7fcde..0000000
--- a/yast2-firewall-2.21.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4bfdb98243c9473a05690a36eb721edb1fcae97ef4e7d3b000410e801f62bea9
-size 116291
diff --git a/yast2-firewall-2.21.2.tar.bz2 b/yast2-firewall-2.21.2.tar.bz2
new file mode 100644
index 0000000..9eec971
--- /dev/null
+++ b/yast2-firewall-2.21.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:605977ce51052f68841d19d882cd909be7f1009d675f9951bb59c44edee58985
+size 116108
diff --git a/yast2-firewall.changes b/yast2-firewall.changes
index 50ad9af..7e5b579 100644
--- a/yast2-firewall.changes
+++ b/yast2-firewall.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov  4 15:50:22 CET 2011 - locilka@suse.cz
+
+- Added function keys for buttons (bnc#595564)
+- 2.21.2
+
 -------------------------------------------------------------------
 Thu Oct 13 10:34:54 CEST 2011 - locilka@suse.cz
 
diff --git a/yast2-firewall.spec b/yast2-firewall.spec
index e3f7e06..5d44e51 100644
--- a/yast2-firewall.spec
+++ b/yast2-firewall.spec
@@ -19,13 +19,11 @@
 
 
 Name:           yast2-firewall
-Version:        2.21.1
+Version:        2.21.2
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-firewall-2.21.1.tar.bz2
-
-Prefix:         /usr
+Source0:        yast2-firewall-%{version}.tar.bz2
 
 Group:          System/YaST
 License:        GPL-2.0+
@@ -51,26 +49,26 @@ Summary:        YaST2 - Firewall Configuration
 A YaST2 module to be used for configuring a firewall.
 
 %prep
-%setup -n yast2-firewall-2.21.1
+%setup -n yast2-firewall-%{version}
 
 %build
-%{prefix}/bin/y2tool y2autoconf
-%{prefix}/bin/y2tool y2automake
+%{_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}
+./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir}
 # V=1: verbose build in case we used AM_SILENT_RULES(yes)
 # so that RPM_OPT_FLAGS check works
 make %{?jobs:-j%jobs} V=1
 
 %install
 make install DESTDIR="$RPM_BUILD_ROOT"
-[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
-for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do
+[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
+for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do
     d=${f##*/}
     %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
 done
@@ -84,8 +82,8 @@ rm -rf "$RPM_BUILD_ROOT"
 /usr/share/YaST2/include/firewall/*
 /usr/share/YaST2/modules/SuSEFirewall*
 /usr/share/YaST2/clients/firewall*
-%{prefix}/share/applications/YaST2/firewall.desktop
+%{_prefix}/share/applications/YaST2/firewall.desktop
 /usr/share/YaST2/schema/autoyast/rnc/firewall.rnc
-%doc %{prefix}/share/doc/packages/yast2-firewall
+%doc %{_prefix}/share/doc/packages/yast2-firewall
 
 %changelog