diff --git a/yast2-apparmor-2.21.5.tar.bz2 b/yast2-apparmor-2.21.5.tar.bz2
deleted file mode 100644
index d1f5de7..0000000
--- a/yast2-apparmor-2.21.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:13fc18c12b66043ba97dfa6f782a295fe02b902fdafb067ceb95ac3cade45a45
-size 152009
diff --git a/yast2-apparmor-2.22.0.tar.bz2 b/yast2-apparmor-2.22.0.tar.bz2
new file mode 100644
index 0000000..14f23c0
--- /dev/null
+++ b/yast2-apparmor-2.22.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8291c2f2607365014ccd4fd25d80145c77b8e2547cb25a7be6798f0f3b40bd37
+size 151466
diff --git a/yast2-apparmor.changes b/yast2-apparmor.changes
index a434566..50fe7cb 100644
--- a/yast2-apparmor.changes
+++ b/yast2-apparmor.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Nov 16 12:36:51 CET 2011 - jsuchome@suse.cz
+
+- merged texts from proofreading 
+- 2.22.0
+
 -------------------------------------------------------------------
 Fri Sep 30 11:57:42 UTC 2011 - jsrain@site
 
diff --git a/yast2-apparmor.spec b/yast2-apparmor.spec
index 0ae633a..75ce213 100644
--- a/yast2-apparmor.spec
+++ b/yast2-apparmor.spec
@@ -19,13 +19,11 @@
 
 
 Name:           yast2-apparmor
-Version:        2.21.5
+Version:        2.22.0
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-apparmor-2.21.5.tar.bz2
-
-Prefix:         /usr
+Source0:        yast2-apparmor-%{version}.tar.bz2
 
 Group:          Productivity/Security
 License:        GPL-2.0+
@@ -53,26 +51,26 @@ This package is part of a suite of tools that used to be named
 SubDomain.
 
 %prep
-%setup -n yast2-apparmor-2.21.5
+%setup -n yast2-apparmor-%{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
@@ -98,7 +96,7 @@ rm -rf "$RPM_BUILD_ROOT"
 %dir %attr(-,root,root) /etc/apparmor
 %config(noreplace) /etc/apparmor/reports.crontab
 %config(noreplace) /etc/apparmor/reports.conf
-%doc %{prefix}/share/doc/packages/yast2-apparmor
+%doc %{_prefix}/share/doc/packages/yast2-apparmor
 
 %post
 REPDIR='/var/log/apparmor/reports'