diff --git a/yast2-apparmor-2.21.2.tar.bz2 b/yast2-apparmor-2.21.2.tar.bz2
deleted file mode 100644
index c44e092..0000000
--- a/yast2-apparmor-2.21.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f444a01b154aa8d071b2214f3669bb5a9c5c70b591dcf5a7b43a966268dc69bd
-size 151613
diff --git a/yast2-apparmor-2.21.3.tar.bz2 b/yast2-apparmor-2.21.3.tar.bz2
new file mode 100644
index 0000000..1101496
--- /dev/null
+++ b/yast2-apparmor-2.21.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:37b578fdbdf6d892737cbffa81e72fcad5d1406b8cc21b5ee34581b34e58d2b5
+size 151461
diff --git a/yast2-apparmor.changes b/yast2-apparmor.changes
index 8a995f2..f430a1c 100644
--- a/yast2-apparmor.changes
+++ b/yast2-apparmor.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Aug  5 12:21:26 CEST 2011 - tgoettlicher@suse.de
+
+- fixed .desktop file (bnc #681249)
+
+-------------------------------------------------------------------
+Tue Aug  2 23:26:27 CEST 2011 - jeffm@suse.de
+
+- Rename files to use proper AppArmor names and abbreviations
+- Change code to reflect new names
+  - Basic version needed to use newer perl-apparmor. This version
+    gets rid of the old SubDomain names entirely.
+- Move yast2-apparmor.desktop to apparmor.desktop
+
 -------------------------------------------------------------------
 Fri Jul 22 16:39:45 CEST 2011 - locilka@suse.cz
 
diff --git a/yast2-apparmor.spec b/yast2-apparmor.spec
index 4e366f9..2791bf4 100644
--- a/yast2-apparmor.spec
+++ b/yast2-apparmor.spec
@@ -1,43 +1,29 @@
 #
-# spec file for package yast2-apparmor
+# spec file for package yast2-apparmor (Version 2.21.3)
 #
-# 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.21.3
+Release:	0
 
-Name:           yast2-apparmor
-Version:        2.21.2
-Release:        1
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-apparmor-2.21.2.tar.bz2
+BuildRoot:	%{_tmppath}/%{name}-%{version}-build
+Source0:	yast2-apparmor-2.21.3.tar.bz2
 
-Prefix:         /usr
+prefix:		/usr
 
-Group:          Productivity/Security
-License:        GPL v2 or later
+Group:	Productivity/Security
+License: GPL v2 or later
 
-Summary:        YaST2 - Plugins for AppArmor Profile Management
-Requires:       yast2 perl-TimeDate
-BuildArch:      noarch
-Obsoletes:      yast2-subdomain
-Provides:       yast2-subdomain
-BuildRequires:  update-desktop-files
+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
+BuildRequires: yast2 yast2-devtools
 
 %if 0%{?suse_version} >= 1140
 # openSUSE-11.4 or newer
@@ -53,7 +39,7 @@ This package is part of a suite of tools that used to be named
 SubDomain.
 
 %prep
-%setup -n yast2-apparmor-2.21.2
+%setup -n yast2-apparmor-2.21.3
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -77,6 +63,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"
 
@@ -84,7 +71,7 @@ rm -rf "$RPM_BUILD_ROOT"
 %defattr(-,root,root)
 /usr/bin/*
 /usr/share/YaST2/clients
-/usr/share/YaST2/include/subdomain
+/usr/share/YaST2/include/apparmor
 # empty directory, commenting out
 # /usr/share/YaST2/include/apparmor-reports
 /usr/share/YaST2/scrconf
@@ -107,4 +94,3 @@ REPDIR3='/var/log/apparmor/reports-exported'
 [ -e $REPDIR ] || mkdir -p $REPDIR
 [ -e $REPDIR2 ] || mkdir -p $REPDIR2
 [ -e $REPDIR3 ] || mkdir -p $REPDIR3
-%changelog