diff -uNbwr kdebase-3.5.9/applnk/Makefile.am kdebase-3.5.9-new/applnk/Makefile.am
--- kdebase-3.5.9/applnk/Makefile.am 2007-01-15 06:32:11.000000000 -0500
+++ kdebase-3.5.9-new/applnk/Makefile.am 2008-02-13 21:05:55.000000000 -0500
xdg_menu_DATA = kde-settings.menu kde-information.menu kde-screensavers.menu
xdg_mergedmenu_DATA = kde-essential.menu
-xdg_mergedmenudir = $(xdg_menudir)/applications-merged
+xdg_mergedmenudir = $(xdg_menudir)/kde-applications-merged
diff -uNbwr kdebase-3.5.9/doc/userguide/kde-for-admins.docbook kdebase-3.5.9-new/doc/userguide/kde-for-admins.docbook
--- kdebase-3.5.9/doc/userguide/kde-for-admins.docbook 2006-07-22 04:15:40.000000000 -0400
+++ kdebase-3.5.9-new/doc/userguide/kde-for-admins.docbook 2008-02-13 21:05:55.000000000 -0500
-<para>Example from <filename>applications.menu</filename>:
+<para>Example from <filename>kde-applications.menu</filename>:
information, see <ulink url="http://www.freedesktop.org/Standards/basedir-spec">http://www.freedesktop.org/Standards/basedir-spec</ulink></para>
-<para>Example from <filename>applications.menu</filename>:
+<para>Example from <filename>kde-applications.menu</filename>:
<title>Essential Menus</title>
-class="directory">$<envar>KDEDIR</envar>/etc/xdg/menus/applications-merged/</filename>
+class="directory">$<envar>KDEDIR</envar>/etc/xdg/menus/kde-applications-merged/</filename>
contains <filename>kde-essential.menu</filename> which includes some
essential menus that are normally not shown in the &kde; menu itself:
diff -uNbwr kdebase-3.5.9/drkonqi/Makefile.am kdebase-3.5.9-new/drkonqi/Makefile.am
--- kdebase-3.5.9/drkonqi/Makefile.am 2005-09-10 04:25:55.000000000 -0400
+++ kdebase-3.5.9-new/drkonqi/Makefile.am 2008-02-13 21:05:55.000000000 -0500
+kdeinit_LTLIBRARIES = drkonqi.la
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-LDADD = $(LIB_KDEUI) $(LIB_KIO)
+drkonqi_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+drkonqi_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
# toplevel.cpp must be last in row due to X-headers being included. (--enable-final)
# Did I mention already that X header files really suck?
-drkonqi_SOURCES = krashdcopinterface.skel main.cpp debugger.cpp krashconf.cpp drbugreport.cpp backtrace.cpp toplevel.cpp
+drkonqi_la_SOURCES = krashdcopinterface.skel main.cpp debugger.cpp krashconf.cpp drbugreport.cpp backtrace.cpp toplevel.cpp
check_PROGRAMS = crashtest
diff -uNbwr kdebase-3.5.9/drkonqi/main.cpp kdebase-3.5.9-new/drkonqi/main.cpp
--- kdebase-3.5.9/drkonqi/main.cpp 2006-07-22 04:15:52.000000000 -0400
+++ kdebase-3.5.9-new/drkonqi/main.cpp 2008-02-13 21:05:55.000000000 -0500
-int main( int argc, char* argv[] )
+extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
diff -uNbwr kdebase-3.5.9/kappfinder/Makefile.am kdebase-3.5.9-new/kappfinder/Makefile.am
--- kdebase-3.5.9/kappfinder/Makefile.am 2005-09-10 04:25:41.000000000 -0400
+++ kdebase-3.5.9-new/kappfinder/Makefile.am 2008-02-13 21:05:55.000000000 -0500
-bin_PROGRAMS = kappfinder
-kappfinder_SOURCES = main.cpp toplevel.cpp common.cpp
-kappfinder_LDADD = $(LIB_KDEUI) $(LIB_KIO)
-kappfinder_LDFLAGS = $(all_libraries) $(KDE_RPATH)