diff --git a/.cvsignore b/.cvsignore
index 5f43e78..99e3795 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 kdemultimedia-3.3.0-patched.tar.bz2
 kdemultimedia-3.3.1-patched.tar.bz2
 kdemultimedia-3.3.2-patched.tar.bz2
+kdemultimedia-3.4.0-patched-rc1.tar.bz2
diff --git a/kdemultimedia.spec b/kdemultimedia.spec
index a0abac3..73292b5 100644
--- a/kdemultimedia.spec
+++ b/kdemultimedia.spec
@@ -1,6 +1,6 @@
 %define debug 0
-
 %define final 0
+%define make_cvs 1
 
 # support mp3
 %define build_mpeglib 0
@@ -26,24 +26,20 @@
 %define patch_name -patched
 %endif
 
-Version: 3.3.2
-Release: 0.2
+Version: 3.4.0
+Release: 0.rc1.1
 Epoch: 6
 Name: kdemultimedia
 Prefix: /usr
 Summary: Multimedia applications for the K Desktop Environment (KDE).
 Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 License: GPL
 Url: http://www.kde.org
-
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}%{patch_name}.tar.bz2
-
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}%{patch_name}-rc1.tar.bz2
 Patch1: kde-libtool.patch
-Patch2: kdemultimedia-3.3.0-vorbis.patch
-
-# Upstream patches
-Patch3: kdemultimedia-3.3.2-patched-cleanup.patch
+Patch2: kdemultimedia-3.4.0-config.patch
+Patch3: admin-visibility.patch
 
 Prereq: /sbin/ldconfig
 
@@ -106,8 +102,8 @@ noatun plugins.
 %prep
 %setup -q -n %{name}-%{version}%{patch_name}
 %patch1 -p1
-%patch2 -p1 -b .vorbis
-%patch3 -p1 -b .cleanup
+%patch2 -p1 -b .config
+%patch3 -p1 -b .gcc
 
 # remove aktion, we don't ship xanim (license problems)
 %if %{redhatify}
@@ -117,7 +113,9 @@ noatun plugins.
 perl -pi -e "s/-fomit-frame-pointer//g" admin/acinclude.m4.in
 perl -pi -e "s,examples,,g" kmid/Make*
 
-make -f admin/Makefile.common cvs
+%if %{make_cvs}
+   make -f admin/Makefile.common cvs
+%endif
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -218,27 +216,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+/etc/xdg/menus/applications-merged/*
 %doc %{_docdir}/HTML/en/artsbuilder
 %if %{juk}
 %doc %{_docdir}/HTML/en/juk
 %endif
 %doc %{_docdir}/HTML/en/kaboodle
 %doc %{_docdir}/HTML/en/kcontrol/kmixcfg
+%doc %{_docdir}/HTML/en/kio_audiocd
 %doc %{_docdir}/HTML/en/kmid
 %doc %{_docdir}/HTML/en/kmix
 %doc %{_docdir}/HTML/en/krec
 %doc %{_docdir}/HTML/en/kscd
 %doc %{_docdir}/HTML/en/noatun
-
-/etc/xdg/menus/applications-merged/*
 %{_libdir}/mcop/*
 %{_libdir}/*.so*
 %{_libdir}/*.la
 %{_libdir}/kde3/*
 %{_bindir}/*
-%{_datadir}/autostart/*
 %{_datadir}/applications/*
 %{_datadir}/apps/*
+%{_datadir}/autostart/*
 %{_datadir}/config.kcfg/*
 %{_datadir}/desktop-directories/*
 %{_datadir}/icons/*/*/*/*
@@ -251,6 +249,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/kde/*
 
 %changelog
+* Mon Feb 28 2005 Than Ngo <than@redhat.com> 6:3.4.0-0.rc1.1
+- KDE 3.4.0 rc1
+
+* Fri Feb 18 2005 Than Ngo <than@redhat.com> 6:3.3.92-0.1
+- KDE-3.4 beta2
+
 * Mon Feb 14 2005 Than Ngo <than@redhat.com> 6:3.3.2-0.2
 - apply Steve cleanup patch
 
diff --git a/sources b/sources
index 3fe6292..de182ca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-60c261854c15e53bdebd736b430df7f9  kdemultimedia-3.3.2-patched.tar.bz2
+6824f340b6bf30a134f1fe6bdbad0199  kdemultimedia-3.4.0-patched-rc1.tar.bz2