diff --git a/gnome-icon-theme.spec b/gnome-icon-theme.spec
index 93168a5..82d3310 100644
--- a/gnome-icon-theme.spec
+++ b/gnome-icon-theme.spec
@@ -1,7 +1,7 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
 Version: 2.23.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: http://download.gnome.org/sources/gnome-icon-theme/2.23/%{name}-%{version}.tar.bz2
 Source1: gnome-icon-theme-extra-device-icons-4.tar.bz2
 License: GPL+
@@ -35,6 +35,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT/usr/share/locale/*
 
 ## create symlinks so the all icon themes know some extra icons we've added
+%if 0
+# don't do this in unstable rawhide, so we can gauge how much of this 
+# is actually needed
 for i in 24x24; do 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$i/apps
 cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$i/apps
@@ -52,7 +55,24 @@ ln -s ../../../gnome/$i/categories/preferences-system.png redhat-server_settings
 ln -s ../../../gnome/$i/categories/preferences-system.png redhat-system_tools.png
 ln -s ../../../gnome/$i/places/start-here.png redhat-starthere.png
 ln -s ../../../gnome/$i/places/user-home.png redhat-home.png
-
+done
+%endif
+
+# create symlinks for gtk stock icons, these are not really 'legacy'
+# this uses the legacy-icon-mapping.xml file in cvs
+cd $RPM_BUILD_ROOT/usr/share/icons/gnome
+for size in 8x8 16x16 22x22 24x24 32x32 48x48 scalable; do
+  (
+  cd $size
+  for context in *; do
+    if [ -d $context ]; then
+      (
+      cd $context
+      INU_DATA_DIR=$RPM_SOURCE_DIR /usr/bin/icon-name-mapping -c $context
+      )
+    fi
+  done
+  )
 done
 
 tar xj -C $RPM_BUILD_ROOT/usr/share/icons/gnome -f %{SOURCE1}
@@ -60,6 +80,8 @@ tar xj -C $RPM_BUILD_ROOT/usr/share/icons/gnome -f %{SOURCE1}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
+
 %post 
 for dir in /usr/share/icons/*; do 
   if test -d "$dir"; then
@@ -73,10 +95,13 @@ done
 %defattr(-,root,root)
 %doc COPYING AUTHORS
 %{_datadir}/icons/gnome
-%{_datadir}/icons/hicolor/*
+#%{_datadir}/icons/hicolor/*
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Fri Jun 20 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.2-2
+- Re-add the symlinks for gtk stock icons, remove some other symlinks
+
 * Tue Jun 17 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.2-1
 - Update to 2.23.2
 
diff --git a/legacy-icon-mapping.xml b/legacy-icon-mapping.xml
new file mode 100644
index 0000000..6f2dcc5
--- /dev/null
+++ b/legacy-icon-mapping.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" standalone="yes" ?>
+<!-- icon mapping for gtk stock icons -->
+<!DOCTYPE mapping SYSTEM "legacy-icon-mapping.dtd">
+
+<mapping>
+    <context dir="actions">
+	<icon name="application-exit">
+	    <link>gtk-quit</link>
+	</icon>
+	<icon name="dialog-cancel">
+	    <link>gtk-cancel</link>
+	</icon>
+	<icon name="document-new">
+	    <link>gtk-new</link>
+	</icon>
+	<icon name="document-open">
+	    <link>gtk-open</link>
+	</icon>
+	<icon name="document-print">
+	    <link>gtk-print</link>
+	</icon>
+	<icon name="document-print-preview">
+	    <link>gtk-print-preview</link>
+	</icon>
+	<icon name="document-properties">
+	    <link>gtk-properties</link>
+	</icon>
+	<icon name="document-revert">
+	    <link>gtk-revert-to-saved-ltr</link>
+	    <link>gtk-revert-to-saved-rtl</link>
+	</icon>
+	<icon name="document-save">
+	    <link>gtk-save</link>
+	</icon>
+	<icon name="document-save-as">
+	    <link>gtk-save-as</link>
+	</icon>
+	<icon name="edit-clear">
+	    <link>gtk-clear</link>
+	</icon>
+	<icon name="edit-copy">
+	    <link>gtk-copy</link>
+	</icon>
+	<icon name="edit-cut">
+	    <link>gtk-cut</link>
+	</icon>
+	<icon name="edit-delete">
+	    <link>gtk-delete</link>
+	</icon>
+	<icon name="edit-find">
+	    <link>gtk-find</link>
+	</icon>
+	<icon name="edit-find-replace">
+	    <link>gtk-find-and-replace</link>
+	</icon>
+	<icon name="edit-paste">
+	    <link>gtk-paste</link>
+	</icon>
+	<icon name="edit-redo">
+	    <link>gtk-redo-ltr</link>
+	</icon>
+	<icon name="edit-select-all">
+	    <link>gtk-select-all</link>
+	</icon>
+	<icon name="edit-undo">
+	    <link>gtk-undo-ltr</link>
+	</icon>
+	<icon name="format-indent-less">
+	    <link>gtk-indent-rtl</link>
+	    <link>gtk-unindent-ltr</link>
+	</icon>
+	<icon name="format-indent-more">
+	    <link>gtk-indent-ltr</link>
+	    <link>gtk-unindent-rtl</link>
+	</icon>
+	<icon name="format-justify-center">
+	    <link>gtk-justify-center</link>
+	</icon>
+	<icon name="format-justify-fill">
+	    <link>gtk-justify-fill</link>
+	</icon>
+	<icon name="format-justify-left">
+	    <link>gtk-justify-left</link>
+	</icon>
+	<icon name="format-justify-right">
+	    <link>gtk-justify-right</link>
+	</icon>
+	<icon name="format-text-bold">
+	    <link>gtk-bold</link>
+	</icon>
+	<icon name="format-text-italic">
+	    <link>gtk-italic</link>
+	</icon>
+	<icon name="format-text-strikethrough">
+	    <link>gtk-strikethrough</link>
+	</icon>
+	<icon name="format-text-underline">
+	    <link>gtk-underline</link>
+	</icon>
+	<icon name="go-bottom">
+	    <link>gtk-goto-bottom</link>
+	</icon>
+	<icon name="go-down">
+	    <link>gtk-go-down</link>
+	</icon>
+	<icon name="go-first">
+	    <link>gtk-goto-first-ltr</link>
+	    <link>gtk-goto-last-rtl</link>
+	</icon>
+	<icon name="go-home">
+	    <link>gtk-home</link>
+	</icon>
+	<icon name="go-jump">
+	    <link>gtk-jump-to-ltr</link>
+	    <link>gtk-jump-to-rtl</link>
+	</icon>
+	<icon name="go-last">
+	    <link>gtk-goto-last-ltr</link>
+	    <link>gtk-goto-first-rtl</link>
+	</icon>
+	<icon name="go-next">
+	    <link>gtk-go-forward-ltr</link>
+	    <link>gtk-go-back-rtl</link>
+	</icon>
+	<icon name="go-previous">
+	    <link>gtk-go-back-ltr</link>
+	    <link>gtk-go-forward-rtl</link>
+	</icon>
+	<icon name="go-top">
+	    <link>gtk-goto-top</link>
+	</icon>
+	<icon name="go-up">
+	    <link>gtk-go-up</link>
+	</icon>
+	<icon name="help-about">
+	    <link>gtk-about</link>
+	</icon>
+	<icon name="list-add">
+	    <link>gtk-add</link>
+	</icon>
+	<icon name="list-remove">
+	    <link>gtk-remove</link>
+	</icon>
+	<icon name="media-playback-pause">
+	    <link>gtk-media-pause</link>
+	</icon>
+	<icon name="media-playback-start">
+	    <link>gtk-media-play-ltr</link>
+	</icon>
+	<icon name="media-playback-stop">
+	    <link>gtk-media-stop</link>
+	</icon>
+	<icon name="media-record">
+	    <link>gtk-media-record</link>
+	</icon>
+	<icon name="media-seek-backward">
+	    <link>gtk-media-rewind-ltr</link>
+	    <link>gtk-media-forward-rtl</link>
+	</icon>
+	<icon name="media-seek-forward">
+	    <link>gtk-media-forward-ltr</link>
+	    <link>gtk-media-rewind-rtl</link>
+	</icon>
+	<icon name="media-skip-backward">
+	    <link>gtk-media-previous-ltr</link>
+	    <link>gtk-media-next-rtl</link>
+	</icon>
+	<icon name="media-skip-forward">
+	    <link>gtk-media-next-ltr</link>
+	    <link>gtk-media-previous-rtl</link>
+	</icon>
+	<icon name="process-stop">
+	    <link>gtk-cancel</link>
+	    <link>gtk-stop</link>
+	</icon>
+	<icon name="system-run">
+	    <link>gtk-execute</link>
+	</icon>
+	<icon name="tools-check-spelling">
+	    <link>gtk-spell-check</link>
+	</icon>
+	<icon name="view-fullscreen">
+	    <link>gtk-fullscreen</link>
+	</icon>
+	<icon name="view-refresh">
+	    <link>gtk-refresh</link>
+	</icon>
+	<icon name="view-restore">
+	    <link>gtk-leave-fullscreen</link>
+	</icon>
+	<icon name="view-sort-ascending">
+	    <link>gtk-sort-ascending</link>
+	</icon>
+	<icon name="view-sort-descending">
+	    <link>gtk-sort-descending</link>
+	</icon>
+	<icon name="window-close">
+	    <link>gtk-close</link>
+	</icon>
+	<icon name="zoom-best-fit">
+	    <link>gtk-zoom-fit</link>
+	</icon>
+        <icon name="zoom-in">
+            <link>gtk-zoom-in</link>
+        </icon>
+        <icon name="zoom-original">
+            <link>gtk-zoom-100</link>
+        </icon>
+        <icon name="zoom-out">
+            <link>gtk-zoom-out</link>
+        </icon>
+    </context>
+    <context dir="apps">
+	<icon name="help-browser">
+	    <link>gtk-help</link>
+	</icon>
+    </context>
+    <context dir="categories">
+	<icon name="preferences-desktop">
+	    <link>gtk-preferences</link>
+	</icon>
+    </context>
+    <context dir="devices">
+	<icon name="drive-harddisk">
+	    <link>gtk-harddisk</link>
+	</icon>
+	<icon name="media-floppy">
+	    <link>gtk-floppy</link>
+	</icon>
+	<icon name="media-optical">
+	    <link>gtk-cdrom</link>
+	</icon>
+	<icon name="printer">
+	    <link>gtk-print</link>
+	</icon>
+    </context>
+    <context dir="mimetypes">
+	<icon name="text-x-preview">
+	    <link>gtk-file</link>
+	</icon>
+    </context>
+    <context dir="places">
+	<icon name="folder">
+	    <link>gtk-directory</link>
+	</icon>
+	<icon name="network-workgroup">
+	    <link>gtk-network</link>
+	</icon>
+    </context>
+    <context dir="status">
+	<icon name="dialog-error">
+	    <link>gtk-dialog-error</link>
+	</icon>
+	<icon name="dialog-information">
+	    <link>gtk-dialog-info</link>
+	</icon>
+	<icon name="dialog-password">
+	    <link>gtk-dialog-authentication</link>
+	</icon>
+	<icon name="dialog-question">
+	    <link>gtk-dialog-question</link>
+	</icon>
+	<icon name="dialog-warning">
+	    <link>gtk-dialog-warning</link>
+	</icon>
+    </context>
+</mapping>