diff --git a/gnome-icon-theme.spec b/gnome-icon-theme.spec
index 317b330..8c0f178 100644
--- a/gnome-icon-theme.spec
+++ b/gnome-icon-theme.spec
@@ -1,14 +1,9 @@
 Summary: GNOME icon theme
 Name: gnome-icon-theme
 Version: 2.30.1
-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.30/%{name}-%{version}.tar.bz2
-Source1: gnome-icon-theme-extra-device-icons-5.tar.bz2
-Source2: legacy-icon-mapping.xml
-Source3: window.png
-Source4: gtk_print_icons.tar.bz2
-Source5: lost-icons.tar.bz2
 License: GPL+
 BuildArch: noarch
 Group: User Interface/Desktops
@@ -24,6 +19,15 @@ Requires(postun): gtk2 >= 2.6.2
 %description
 This package contains the default icon theme used by the GNOME desktop.
 
+%package legacy
+Summary: Old names for icons in gnome-icon-theme
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+
+%description legacy
+This package contains symlinks to make the icons in gnome-icon-theme
+available under old names.
+
 %prep
 %setup -q
 
@@ -33,20 +37,40 @@ This package contains the default icon theme used by the GNOME desktop.
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
+(cd $RPM_BUILD_ROOT%{_datadir}
+ echo "%%defattr(-,root,root)"
+ find icons/gnome -name "gtk-\*" -or -not -type l -printf "%%%%{_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"
+) > legacy.txt
+
 %posttrans
 gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
 
 %postun
 gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
 
-%files
+%posttrans legacy
+gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
+
+%postun legacy
+gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
+
+%files -f files.txt
 %defattr(-,root,root)
 %doc COPYING AUTHORS
-%{_datadir}/icons/gnome
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
+%files legacy -f legacy.txt
 
 %changelog
+* Tue Apr 20 2010 Matthias Clasen <mclasen@redhat.com> 2.30.1-2
+- Drop extra icons
+- Split off a legacy subpackage
+
 * Sun Apr 18 2010 Matthias Clasen <mclasen@redhat.com> 2.30.1-1
 - Update to 2.30.1