--- kdelibs-4.0.2/kded/applications.menu.orig	2008-01-05 01:00:10.000000000 +0100

+++ kdelibs-4.0.2/kded/applications.menu	2008-03-28 12:49:11.000000000 +0100

@@ -31,12 +31,31 @@

 					<Category>Core</Category>

 					<Not><Category>KDE</Category></Not>

 				</And>

+				<Category>X-Red-Hat-Base</Category>

 				<Category>X-SuSE-YaST</Category>

 			</Not>

 		</Include>

 	</Menu>

 	<Menu>

+		<Name>System Settings</Name>

+		<Directory>SystemConfig.directory</Directory>

+		<Include>

+			<And>

+				<Category>System</Category>

+				<Category>Settings</Category>

+				<Not><Category>X-Red-Hat-ServerConfig</Category></Not>

+			</And>

+		</Include>

+		<Menu>

+			<Name>Server</Name>

+			<Directory>ServerConfig.directory</Directory>

+			<Include>

+				<Category>X-Red-Hat-ServerConfig</Category>

+			</Include>

+		</Menu>

+	</Menu>

+	<Menu>

 		<Name>Development</Name>

 		<Directory>kde-development.directory</Directory>

 		<Menu>

@@ -341,7 +360,11 @@

 		<Name>Settingsmenu</Name>

 		<Directory>kde-settingsmenu.directory</Directory>

 		<Include>

-			<Category>Settings</Category>

+			<And>

+				<Category>Settings</Category>

+				<Not><Category>System</Category></Not>

+				<Not><Category>X-Red-Hat-ServerConfig</Category></Not>

+			</And>

 		</Include>

 	</Menu>

 	<Menu>

@@ -350,7 +373,9 @@

 		<Include>

 			<And>

 				<Category>System</Category>

+				<Not><Category>Settings</Category></Not>

 				<Not><Category>X-KDE-More</Category></Not>

+				<Not><Category>X-Red-Hat-ServerConfig</Category></Not>

 			</And>

 		</Include>

 		<Menu>