diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8236ce3c5..1a869bb6f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -218,6 +218,7 @@ check_type_size( "long long" LONG_LONG )
 ##### tdebase directories #######################
 
 add_subdirectory( tdmlib )
+add_subdirectory( kcontrol )
 
 tde_conditional_add_subdirectory( BUILD_TDEINIT tdeinit )
 tde_conditional_add_subdirectory( BUILD_L10N l10n )
@@ -226,7 +227,6 @@ tde_conditional_add_subdirectory( BUILD_APPLNK applnk )
 tde_conditional_add_subdirectory( BUILD_DOC doc )
 tde_conditional_add_subdirectory( BUILD_LIBKONQ libkonq )
 tde_conditional_add_subdirectory( BUILD_KCMINIT kcminit )
-add_subdirectory( kcontrol )
 tde_conditional_add_subdirectory( BUILD_TWIN twin )
 tde_conditional_add_subdirectory( BUILD_KATE kate )
 tde_conditional_add_subdirectory( BUILD_KONQUEROR konqueror )
@@ -271,8 +271,8 @@ tde_conditional_add_subdirectory( BUILD_TQT3INTEGRATION tqt3integration )
 ##### install starttde & related stuff ##########
 
 if( BUILD_STARTTDE )
-  install( PROGRAMS starttde DESTINATION ${BIN_INSTALL_DIR} )
-  install( PROGRAMS migratekde3 r14-xdg-update release_notes DESTINATION ${BIN_INSTALL_DIR} )
+  install( PROGRAMS starttde migratekde3 r14-xdg-update tde_release_notes
+           DESTINATION ${BIN_INSTALL_DIR} )
 endif()
 
 
diff --git a/Makefile.am.in b/Makefile.am.in
index e32d5632f..793c08688 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -9,7 +9,7 @@ COMPILE_AFTER_kcontrol = tdm kdesktop
 
 AUTOMAKE_OPTIONS = foreign 1.6.1
 
-bin_SCRIPTS = starttde trinity migratekde3 r14-xdg-update release_notes
+bin_SCRIPTS = starttde migratekde3 r14-xdg-update tde_release_notes
 
 EXTRA_DIST = admin bsd-port debian tdebase.spec.in README.pam kde.pamd tdescreensaver.pamd mkpamserv
 
diff --git a/doc/releasenotes/CMakeLists.txt b/doc/releasenotes/CMakeLists.txt
index d4dcd347b..4392e53e4 100644
--- a/doc/releasenotes/CMakeLists.txt
+++ b/doc/releasenotes/CMakeLists.txt
@@ -8,4 +8,4 @@
 
 tde_create_handbook( DESTINATION khelpcenter/releasenotes )
 
-install( FILES release_notes.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
+install( FILES tde_release_notes.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
diff --git a/doc/releasenotes/Makefile.am b/doc/releasenotes/Makefile.am
index 1778da0ca..b6849ee28 100644
--- a/doc/releasenotes/Makefile.am
+++ b/doc/releasenotes/Makefile.am
@@ -1,6 +1,6 @@
 KDE_LANG = en
 KDE_DOCS = khelpcenter/releasenotes
 
-autostart_DATA = release_notes.desktop
+autostart_DATA = tde_release_notes.desktop
 autostartdir = $(datadir)/autostart
 
diff --git a/doc/releasenotes/release_notes.desktop b/doc/releasenotes/tde_release_notes.desktop
similarity index 75%
rename from doc/releasenotes/release_notes.desktop
rename to doc/releasenotes/tde_release_notes.desktop
index 64a324853..eb82e1dea 100644
--- a/doc/releasenotes/release_notes.desktop
+++ b/doc/releasenotes/tde_release_notes.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=release_notes
-Exec=release_notes
+Name=tde_release_notes
+Exec=tde_release_notes
 Type=Application
 X-TDE-autostart-phase=2
 X-TDE-StartupNotify=false
diff --git a/release_notes b/tde_release_notes
similarity index 94%
rename from release_notes
rename to tde_release_notes
index bffb9f453..bd4e27e0d 100644
--- a/release_notes
+++ b/tde_release_notes
@@ -8,7 +8,7 @@
 # When the release version increments, this script will detect the
 # difference through tde-config and a respective key in kdeglobals.
 # This script then will open the release notes for that next release.
-# The only file to update is: tdebase/doc/releasenotes/release_notes.docbook.
+# The only file to update is: tdebase/doc/releasenotes/index.docbook.
 
 # As this script is run as a global TDE autostart app, all
 # environment variables should already be set.