diff --git a/kdelibs.spec b/kdelibs.spec
index 3bafcea..c73169c 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -42,7 +42,6 @@ Patch1: kdelibs-3.5.1-xdg-menu.patch
 Patch2: kdelibs-3.0.0-ndebug.patch
 Patch4: kdelibs-3.0.4-ksyscoca.patch
 Patch5: kdelibs-3.5.0-openssl0.9.8a.patch
-Patch7: kdelibs-3.4.0-menu.patch
 Patch15: kdelibs-3.4.91-buildroot.patch
 Patch16: kdelibs-3.1-ssl-krb5.patch
 Patch20: kdelibs-3.3.92-defaultstyle.patch
@@ -175,7 +174,6 @@ format for easy browsing
 %endif
 %patch4 -p1 -b .ksyscoca
 %patch5 -p1 -b .openssl
-%patch7 -p1 -b .menu
 %patch15 -p1 -b .buildroot
 %patch16 -p1 -b .ssl-krb5
 %patch20 -p1 -b .defaultstyle
@@ -211,15 +209,8 @@ FLAGS="$RPM_OPT_FLAGS"
    FLAGS="-O0"
 %endif
 
-# workaround for compiler bug on ia64, will be removed later
-%ifarch ia64
-export CFLAGS="$RPM_OPT_FLAGS -O0"
-export CXXFLAGS="$RPM_OPT_FLAGS -O0"
-%endif
-
 export CXXFLAGS="$FLAGS"
 export CFLAGS="$FLAGS"
-export QTLIB=$QTDIR/lib
 
 if pkg-config openssl ; then
    export CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
@@ -295,22 +286,22 @@ make %{?_smp_mflags}
 make apidox
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/*
-install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/services/
+chmod a+x %{buildroot}%{_libdir}/*
+install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/services/
 
-pushd $RPM_BUILD_ROOT%{_docdir}
+pushd %{buildroot}%{_docdir}
 ln -sf HTML/en/kdelibs-apidocs %{name}-devel-%{kde_major_version}
 popd
 
-mkdir -p $RPM_BUILD_ROOT/etc/profile.d
-install -m 755 %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d/
+mkdir -p %{buildroot}%{_sysconfdir}/profile.d
+install -m 755 %{SOURCE1} %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/
 
 # Make symlinks relative
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    if [ -d $i -a -L $i/common ]; then
       rm -f $i/common
@@ -320,16 +311,17 @@ done
 popd
 
 %if %{redhatify}
-   pushd $RPM_BUILD_ROOT/etc/xdg/menus/
-      mv applications.menu kde-applications.menu
+   mkdir -p %{buildroot}%{_sysconfdir}/xdg.d/kde/menus
+   pushd %{buildroot}}%{_sysconfdir}/xdg/menus/
+      mv applications.menu %{buildroot}%{_sysconfdir}/xdg.d/kde/menus
       ln -s applications-merged kde-applications-merged
    popd
-   echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/kresources.desktop
-   rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/index.theme
+   echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop
+   rm -f %{buildroot}%{_datadir}/icons/hicolor/index.theme
 %endif
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %pre
 if [ -d /etc/skel/Desktop/Autostart ]; then
@@ -357,8 +349,12 @@ fi
 
 %files
 %defattr(-,root,root)
-/etc/profile.d/*
-/etc/xdg/menus/*
+%dir %{_sysconfdir}/xdg.d
+%dir %{_sysconfdir}/xdg.d/kde
+%dir %{_sysconfdir}/xdg.d/kde/menus
+%{_sysconfdir}/profile.d/*
+%{_sysconfdir}/xdg/menus/*
+%{_sysconfdir}/xdg.d/kde/menus/*
 %{_bindir}/*
 %attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
 %attr(4755,root,root) %{_bindir}/kgrantpty
@@ -395,6 +391,7 @@ fi
 %changelog
 * Wed May 03 2006 Than Ngo <than@redhat.com> 6:3.5.2-3
 - fix #173235, disable kmail debug info #173235
+- use XDG_CONFIG_DIRS for kde menu #178320
 
 * Fri Apr 21 2006 Than Ngo <than@redhat.com> 6:3.5.2-2
 - apply patch to fix crash kdeprint