diff --git a/yast2-apparmor-2.0.2-857.tar.gz b/yast2-apparmor-2.0.2-857.tar.gz
deleted file mode 100644
index ff9b0e9..0000000
--- a/yast2-apparmor-2.0.2-857.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:261c58ed1d4abe1e088917bd1e3204e13d019a8aaae3c03bd43e18c57269bceb
-size 296058
diff --git a/yast2-apparmor-2.1-909.tar.gz b/yast2-apparmor-2.1-909.tar.gz
new file mode 100644
index 0000000..78fb3f3
--- /dev/null
+++ b/yast2-apparmor-2.1-909.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:98f1591902ba736c4a5c658e14c03c8bd2e86831b7aa8dd8d76e579cdba1961d
+size 297734
diff --git a/yast2-apparmor.changes b/yast2-apparmor.changes
index 391df24..9bcb455 100644
--- a/yast2-apparmor.changes
+++ b/yast2-apparmor.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Aug 20 17:57:15 CEST 2007 - dreynolds@suse.de
+
+- sbeattie@suse.de
+  Fix for #212500 "y2controlcenter-gnome does not find AppArmor
+  icons" and its duplicate #297243 "Missing YaST icon: All app armor
+  icons".
+
 -------------------------------------------------------------------
 Mon Jul 30 05:05:01 CEST 2007 - dreynolds@suse.de
 
diff --git a/yast2-apparmor.spec b/yast2-apparmor.spec
index 18578bb..5937130 100644
--- a/yast2-apparmor.spec
+++ b/yast2-apparmor.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-apparmor (Version 2.0.2)
+# spec file for package yast2-apparmor (Version 2.1)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,11 +11,11 @@
 # norootforbuild
 
 Name:           yast2-apparmor
-Summary:        Yast2 plugins for AppArmor profile management
-Version:        2.0.2
-Release:        8
+Summary:        YaST2 - Plugins for AppArmor Profile Management
+Version:        2.1
+Release:        1
 Group:          Productivity/Security
-Source0:        %{name}-%{version}-857.tar.gz
+Source0:        %{name}-%{version}-909.tar.gz
 License:        GPL v2 or later
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 URL:            http://forge.novell.com/modules/xfmod/project/?apparmor
@@ -24,14 +24,19 @@ BuildArch: noarch
 Obsoletes:      yast2-subdomain
 Provides:       yast2-subdomain
 BuildRequires:  update-desktop-files
+BuildRequires:  yast2 yast2-devtools
 %if %{suse_version} > 1010 
-BuildRequires:  yast2 yast2-devtools yast2-theme-openSUSE
+BuildRequires:  yast2-theme-openSUSE
 %define themedir /usr/share/YaST2/theme/openSUSE
 %else
   %if %{suse_version} > 1000 
-BuildRequires:  yast2 yast2-devtools yast2-theme-SuSELinux
-%define themedir /usr/share/YaST2/theme/SuSELinux
+    %if 0%{?sles_version} > 9
+BuildRequires:  yast2-theme-NLD
+    %else
+BuildRequires:  yast2-theme-SuSELinux
+    %endif
   %endif
+%define themedir /usr/share/YaST2/theme/SuSELinux
 %endif
 
 %description
@@ -68,6 +73,20 @@ for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.des
     	%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
     fi
 done
+# make icons available to GNOME control center (hicolor theme)
+# (bug #212500)
+mkdir -p ${RPM_BUILD_ROOT}/usr/share/icons/hicolor/22x22/apps
+mkdir -p ${RPM_BUILD_ROOT}/usr/share/icons/hicolor/32x32/apps
+mkdir -p ${RPM_BUILD_ROOT}/usr/share/icons/hicolor/48x48/apps
+cd $RPM_BUILD_ROOT/%{themedir}/icons
+for dir in 22x22 32x32 48x48; do
+    cd $RPM_BUILD_ROOT/%{themedir}/icons/${dir}/apps
+    icons=$(ls *.png)
+    cd $RPM_BUILD_ROOT/usr/share/icons/hicolor/${dir}/apps
+    for icon in ${icons}; do
+	ln -s %{themedir}/icons/${dir}/apps/${icon} .
+    done
+done
 
 %clean 
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -83,6 +102,7 @@ done
 /usr/lib/YaST2/servers_non_y2
 /usr/lib/perl5/vendor_perl/*
 %{themedir}/icons
+/usr/share/icons/hicolor/
 %doc COPYING.LGPL
 %dir %attr(-,root,root) /etc/apparmor
 %config(noreplace) /etc/apparmor/reports.crontab
@@ -99,6 +119,11 @@ REPDIR3='/var/log/apparmor/reports-exported'
 %preun
 
 %changelog
+* Mon Aug 20 2007 - dreynolds@suse.de
+- sbeattie@suse.de
+  Fix for #212500 "y2controlcenter-gnome does not find AppArmor
+  icons" and its duplicate #297243 "Missing YaST icon: All app armor
+  icons".
 * Mon Jul 30 2007 - dreynolds@suse.de
 - Numerous fixes for repository integration
 * Mon Jul 16 2007 - dreynolds@suse.de