diff --git a/.cvsignore b/.cvsignore
index 61e9b5d..c6de82e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-kdeartwork-3.1.4.tar.bz2
+kdeartwork-3.1.95.tar.bz2
diff --git a/kdeartwork.spec b/kdeartwork.spec
index 51cdc29..81c0c41 100644
--- a/kdeartwork.spec
+++ b/kdeartwork.spec
@@ -1,17 +1,13 @@
 %define debug 0
-
-%define strip_bin 0
 %define final 0
-%define rpm_clean 1
 
-%define desktop_file 1
-%define desktop_file_utils_version 0.2.93
+%define rpm_clean 1
 
-%define qt_version 3.1.2
+%define qt_version 3.2.2
 
 Name: kdeartwork
-Version: 3.1.4
-Release: 1
+Version: 3.1.95
+Release: 0.1
 Summary: Additional artwork (themes, sound themes, ...) for KDE
 URL: http://www.kde.org/
 License: GPL
@@ -20,11 +16,6 @@ BuildRoot: %{_tmppath}/%{name}-root
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch: kde-libtool.patch
-Patch1: kdeartwork-3.1.4-flags.patch
-
-%if %{desktop_file}
-BuildRequires:desktop-file-utils >= %{desktop_file_utils_version}
-%endif
 
 BuildRequires: perl
 BuildRequires: kdelibs-devel >= %{version}
@@ -53,14 +44,21 @@ Requires: qt >= 1:%{qt_version}
 Requires: xscreensaver
 
 %description
-Additional artwork (themes, sound themes, icons, screensavers ...) for KDE
+Additional artwork (themes, sound themes, screensavers ...) for KDE
+
+%package icons
+Summary: icon themes (kdeclassic, slick ....) for KDE
+Group: User Interface/Desktops
+Requires: %{name} = %{version}
+
+%description icons
+The kdeartwork-icons package contains icon themes (kdeclassic, slick ...)
+for KDE
 
 %prep
-rm -rf $RPM_BUILD_ROOT
 
 %setup -q
 %patch -p1 -b .libtool
-%patch1 -p0 -b .flags
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -71,30 +69,19 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fno-use-cxa-atexit"
 
 make -f admin/Makefile.common cvs
 
-%configure --with-qt-libraries=$QTDIR/lib
+%configure \
+   --with-qt-libraries=$QTDIR/lib \
+%if %{final}
+   --enable-final \
+%endif
+   --disable-rpath
 
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR="$RPM_BUILD_ROOT"
+rm -rf $RPM_BUILD_ROOT
 
-# move desktop files back
-pushd $RPM_BUILD_ROOT%{_datadir}/applnk
-for i in `find . -name "More"`; do
-   if /bin/ls $i/*.desktop >& /dev/null ; then
-      pushd $i
-      for j in *.desktop ; do
-         grep "Hidden=true" $j >& /dev/null || mv -f $j ..
-      done
-      popd
-   fi
-done
-popd
-
-%if %{desktop_file}
-mv $RPM_BUILD_ROOT%{_datadir}/applnk/System/ScreenSavers \
-   $RPM_BUILD_ROOT%{_datadir}/apps/kscreensaver/
-%endif
+make install DESTDIR="$RPM_BUILD_ROOT"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -102,29 +89,41 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %config %{_datadir}/config/*
-
 %{_bindir}/*
-
 %{_libdir}/kde3/plugins/styles/*
-%{_libdir}/kde3/*.so
 %{_libdir}/kde3/*.la
-
-%{_datadir}/apps/kwin/icewm-themes/*
+%{_libdir}/kde3/*.so*
+%{_datadir}/apps/kwin/icewm-themes
+%{_datadir}/apps/kwin/glow-themes
 %{_datadir}/apps/kwin/*.desktop
 %{_datadir}/apps/kstyle/themes/*
 %{_datadir}/sounds/*
 %{_datadir}/wallpapers/*
-%{_datadir}/icons/*
 %{_datadir}/apps/kscreensaver/*.png
 %{_datadir}/apps/kworldclock/maps/*
-
-%if %{desktop_file}
-%{_datadir}/apps/kscreensaver/ScreenSavers/*.desktop
-%else
 %{_datadir}/applnk/System/ScreenSavers/*.desktop
-%endif
+
+%files icons
+%defattr(-,root,root)
+%{_datadir}/icons/*
 
 %changelog
+* Mon Jan 19 2004 Than Ngo <than@redhat.com> 3.1.95-0.1
+- KDE 3.2 RC1
+
+* Mon Dec 15 2003 Than Ngo <than@redhat.com> 3.1.94-0.2
+- subpackage for icon
+
+* Mon Dec 01 2003 Than Ngo <than@redhat.com> 3.1.94-0.1
+- KDE 3.2 Beta 2
+
+* Thu Nov 27 2003 Than Ngo <than@redhat.com> 3.1.93-0.2
+- get rid of rpath
+
+* Wed Nov 12 2003 Than Ngo <than@redhat.com> 3.1.93-0.1
+- KDE 3.2 Beta1
+- cleanup
+
 * Tue Sep 30 2003 Than Ngo <than@redhat.com> 3.1.4-1
 - 3.1.4
 
diff --git a/sources b/sources
index 6291c16..6be1d03 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-042e42ade90a8d137edea88eb7d3e11d  kdeartwork-3.1.4.tar.bz2
+a3b7422040162f27fc99f649dae21358  kdeartwork-3.1.95.tar.bz2