diff --git a/yast2-apparmor-2.20.1.tar.bz2 b/yast2-apparmor-2.20.1.tar.bz2
deleted file mode 100644
index cb730c6..0000000
--- a/yast2-apparmor-2.20.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f752927c43e5e5425df23db2942198ecfc0b22030987667a7baea7e3495f6a4f
-size 152386
diff --git a/yast2-apparmor.changes b/yast2-apparmor.changes
index be71e71..4e246e1 100644
--- a/yast2-apparmor.changes
+++ b/yast2-apparmor.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jun 14 13:29:32 UTC 2011 - jreidinger@novell.com
+
+- merge apparmor to one desktop entry (FATE#305278)
+- fix typos in translatable strings
+- 2.21.0
+
-------------------------------------------------------------------
Thu Feb 24 14:31:56 UTC 2011 - lslezak@suse.cz
diff --git a/yast2-apparmor.spec b/yast2-apparmor.spec
deleted file mode 100644
index 9bf4f71..0000000
--- a/yast2-apparmor.spec
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-# spec file for package yast2-apparmor
-#
-# Copyright (c) 2011 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-apparmor
-Version: 2.20.1
-Release: 1
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-apparmor-2.20.1.tar.bz2
-
-Prefix: /usr
-
-Group: Productivity/Security
-License: GPLv2+
-
-Summary: YaST2 - Plugins for AppArmor Profile Management
-Requires: yast2 perl-TimeDate
-BuildArch: noarch
-Obsoletes: yast2-subdomain
-Provides: yast2-subdomain
-BuildRequires: update-desktop-files
-
-BuildRequires: yast2 yast2-devtools
-
-%if 0%{?suse_version} >= 1140
-# openSUSE-11.4 or newer
-BuildRequires: perl-macros
-%{perl_requires}
-%endif
-
-%description
-Yast2 forms and components for the management of Novell AppArmor
-profiles.
-
-This package is part of a suite of tools that used to be named
-SubDomain.
-
-%prep
-%setup -n yast2-apparmor-2.20.1
-
-%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)
-# 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
- d=${f##*/}
- %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
-done
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
-%files
-%defattr(-,root,root)
-/usr/bin/*
-/usr/share/YaST2/clients
-/usr/share/YaST2/include/subdomain
-# empty directory, commenting out
-# /usr/share/YaST2/include/apparmor-reports
-/usr/share/YaST2/scrconf
-/usr/share/YaST2/modules
-/usr/share/applications/YaST2
-/usr/lib/YaST2/servers_non_y2
-%dir %{perl_vendorlib}/Immunix
-%{perl_vendorlib}/Immunix/Notify.pm
-# license is questionable, PDB says GPL v2 or later
-#%doc COPYING.LGPL
-%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
-
-%post
-REPDIR='/var/log/apparmor/reports'
-REPDIR2='/var/log/apparmor/reports-archived'
-REPDIR3='/var/log/apparmor/reports-exported'
-[ -e $REPDIR ] || mkdir -p $REPDIR
-[ -e $REPDIR2 ] || mkdir -p $REPDIR2
-[ -e $REPDIR3 ] || mkdir -p $REPDIR3
-%changelog