diff --git a/gnome-icon-theme.spec b/gnome-icon-theme.spec
index 621b9d4..21881c4 100644
--- a/gnome-icon-theme.spec
+++ b/gnome-icon-theme.spec
@@ -1,9 +1,10 @@
 Summary: GNOME icon theme
 Name: gnome-icon-theme
 Version: 2.91.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 #VCS: git:git://git.gnome.org/gnome-icon-theme
 Source0: http://download.gnome.org/sources/gnome-icon-theme/2.91/%{name}-%{version}.tar.bz2
+Source1: legacy-icon-mapping.xml
 License: GPL+
 BuildArch: noarch
 Group: User Interface/Desktops
@@ -13,8 +14,8 @@ BuildRequires: librsvg2
 BuildRequires: intltool
 Requires: hicolor-icon-theme
 Requires: pkgconfig
-Requires(posttrans): gtk2 >= 2.6.2
-Requires(postun): gtk2 >= 2.6.2
+Requires(posttrans): gtk2
+Requires(postun): gtk2
 
 %description
 This package contains the default icon theme used by the GNOME desktop.
@@ -37,6 +38,22 @@ available under old names.
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
+cp %{SOURCE1} .
+export INU_DATA_DIR=$PWD
+(cd $RPM_BUILD_ROOT%{_datadir}/icons/gnome
+for size in 8x8 16x16 22x22 24x24 32x32 48x48 256x256; do
+        cd $size || continue;
+        echo -e "Adding rtl variants for $size"
+        for dir in `find . -type d`; do
+                context="`echo $dir | cut -c 3-`"
+                if [ $context ]; then
+                        icon-name-mapping -c $context
+                fi
+        done
+        cd ..
+done
+)
+
 # Add scalable directories for symbolic icons
 (cd $RPM_BUILD_ROOT%{_datadir}/icons/gnome
 
@@ -49,15 +66,17 @@ mkdir -p scalable/places
 mkdir -p scalable/status
 )
 
+touch files.txt
+
 (cd $RPM_BUILD_ROOT%{_datadir}
  echo "%%defattr(-,root,root)"
- find icons/gnome \( -name gtk-* -or -type f \) -printf "%%%%{_datadir}/%%p\n"
+ find icons/gnome \( -name *-rtl.png -or -name *-ltr.png -or -type f \) -printf "%%%%{_datadir}/%%p\n"
  find icons/gnome -type d -printf "%%%%dir %%%%{_datadir}/%%p\n"
 ) > files.txt
 
 (cd $RPM_BUILD_ROOT%{_datadir}
  echo "%%defattr(-,root,root)"
- find icons/gnome \( -type l -and -not -name gtk-* \) -printf "%%%%{_datadir}/%%p\n"
+ find icons/gnome \( -type l -and -not -name *-rtl.png -and -not -name *-ltr.png \) -printf "%%%%{_datadir}/%%p\n"
 ) > legacy.txt
 
 %posttrans
@@ -81,6 +100,11 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
 %defattr(-,root,root)
 
 %changelog
+* Mon Feb  7 2011 Matthias Clasen <mclasen@redhat.com> 2.91.6-2
+- No longer ship gtk- legacy symlinks in the main package,
+  GTK+ doesn't use them anymore
+- Do ship -rtl/-ltr symlinks for some names
+
 * Wed Feb  2 2011 Matthias Clasen <mclasen@redhat.com> 2.91.6-1
 - Update to 2.91.6
 
diff --git a/legacy-icon-mapping.xml b/legacy-icon-mapping.xml
index 4b365d9..3addd30 100644
--- a/legacy-icon-mapping.xml
+++ b/legacy-icon-mapping.xml
@@ -4,279 +4,45 @@
 
 <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-fit-best">
-	    <link>gtk-zoom-fit</link>
-	</icon>
-        <icon name="zoom-in">
-            <link>gtk-zoom-in</link>
+        <icon name="format-indent-less">
+            <link>format-indent-more-rtl</link>
+            <link>format-indent-less-ltr</link>
         </icon>
-        <icon name="zoom-original">
-            <link>gtk-zoom-100</link>
+        <icon name="format-indent-more">
+            <link>format-indent-more-ltr</link>
+            <link>format-indent-less-rtl</link>
         </icon>
-        <icon name="zoom-out">
-            <link>gtk-zoom-out</link>
+        <icon name="go-first">
+            <link>go-first-ltr</link>
+            <link>go-last-rtl</link>
+        </icon>
+        <icon name="go-last">
+            <link>go-last-ltr</link>
+            <link>go-first-rtl</link>
+        </icon>
+        <icon name="go-next">
+            <link>go-next-ltr</link>
+            <link>go-previous-rtl</link>
+        </icon>
+        <icon name="go-previous">
+            <link>go-previous-ltr</link>
+            <link>go-next-rtl</link>
+        </icon>
+        <icon name="media-seek-backward">
+            <link>media-seek-backward-ltr</link>
+            <link>media-seek-forward-rtl</link>
+        </icon>
+        <icon name="media-seek-forward">
+            <link>media-seek-forward-ltr</link>
+            <link>media-seek-backward-rtl</link>
+        </icon>
+        <icon name="media-skip-backward">
+            <link>media-skip-backward-ltr</link>
+            <link>media-skip-forward-rtl</link>
+        </icon>
+        <icon name="media-skip-forward">
+            <link>media-skip-forward-ltr</link>
+            <link>media-skip-backward-rtl</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>
-	<icon name="image-missing">
-	    <link>gtk-missing-image</link>
-	</icon>
-	<icon name="security-high">
-	    <link>stock_lock-ok</link>
-	</icon>
-	<icon name="security-low">
-	    <link>stock_lock-broken</link>
-	</icon>
-	<icon name="changes-prevent">
-	    <link>stock_lock</link>
-	</icon>
-	<icon name="changes-allow">
-	    <link>stock_lock-open</link>
-	</icon>
     </context>
 </mapping>