diff --git a/kdelibs.spec b/kdelibs.spec
index 21c4e13..2944ce1 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -17,7 +17,7 @@
 %define arts 1
 
 Version: 3.5.4
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -34,7 +34,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
@@ -184,7 +183,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
@@ -278,7 +276,7 @@ fi
 %endif
 
 make %{?_smp_mflags}
-make apidox
+make %{?_smp_mflags} apidox
 
 %install
 rm -rf %{buildroot}
@@ -305,12 +303,8 @@ for i in *; do
 done
 popd
 
-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
-   ln -s ../../xdg.d/kde/menus/applications.menu kde-applications.menu
-popd
+mv %{buildroot}%{_sysconfdir}/xdg/menus/applications.menu %{buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu
+
 echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop
 rm -f %{buildroot}%{_datadir}/icons/hicolor/index.theme
 
@@ -346,12 +340,8 @@ fi
 
 %files
 %defattr(-,root,root)
-%dir %{_sysconfdir}/xdg.d
-%dir %{_sysconfdir}/xdg.d/kde
-%dir %{_sysconfdir}/xdg.d/kde/menus
 %config(noreplace) %{_sysconfdir}/profile.d/*
 %{_sysconfdir}/xdg/menus/*
-%{_sysconfdir}/xdg.d/kde/menus/*
 %{_bindir}/artsmessage
 %{_bindir}/checkXML
 %{_bindir}/cupsdconf
@@ -445,6 +435,10 @@ fi
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Sat Sep 30 2006 Than Ngo <than@redhat.com> 6:3.5.4-9
+- FedoraDNA for KDM theme
+- fix #178320,#198828, follow menu-spec
+
 * Tue Sep 26 2006 <than@redhat.com> 6:3.5.4-8
 - fix #115891/bz#208270, CUPS 1.2.x unix socket support
 - apply upstream patches