diff --git a/kdesktop/init/Makefile.am b/kdesktop/init/Makefile.am
index 8e1895bf4..723d416bd 100644
--- a/kdesktop/init/Makefile.am
+++ b/kdesktop/init/Makefile.am
@@ -3,6 +3,9 @@ SUBDIRS = Templates
 kdesktop_init_data_DATA = directory.trash directory.autostart directory.templates directory.desktop
 kdesktop_init_datadir = $(kde_datadir)/kdesktop
 
+kdesktop_builtin_data_DATA = My_Computer My_Documents My_Network_Places Printers Trash Web_Browser
+kdesktop_builtin_datadir = $(kde_datadir)/kdesktop/Desktop
+
 desktoplink_DATA = Home.desktop System.desktop
 desktoplinkdir = $(kde_datadir)/kdesktop/DesktopLinks
 
diff --git a/kdesktop/init/My_Computer b/kdesktop/init/My_Computer
new file mode 100644
index 000000000..bed37415a
--- /dev/null
+++ b/kdesktop/init/My_Computer
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Icon=system
+Name=My Computer
+Name[en_US]=My Computer
+OnlyShowIn=KDE;
+Type=Link
+URL=media:/
\ No newline at end of file
diff --git a/kdesktop/init/My_Documents b/kdesktop/init/My_Documents
new file mode 100644
index 000000000..5db3e561a
--- /dev/null
+++ b/kdesktop/init/My_Documents
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Icon=folder_wordprocessing
+Name=My Documents
+Name[en_US]=My Documents
+OnlyShowIn=KDE;
+Type=Link
+URL=$HOME/Documents
diff --git a/kdesktop/init/My_Network_Places b/kdesktop/init/My_Network_Places
new file mode 100644
index 000000000..58664524e
--- /dev/null
+++ b/kdesktop/init/My_Network_Places
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Icon=network
+Name=My Network Places
+Name[en_US]=My Network Places
+OnlyShowIn=KDE;
+Type=Link
+URL=remote:/
diff --git a/kdesktop/init/Printers b/kdesktop/init/Printers
new file mode 100644
index 000000000..e2711cbf5
--- /dev/null
+++ b/kdesktop/init/Printers
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Icon=kjobviewer
+Name=Printers
+Terminal=false
+Type=Application
+Exec=kjobviewer --all --show %i %m
+OnlyShowIn=KDE;
+X-DCOP-ServiceType=Unique
+X-KDE-StartupNotify=true
diff --git a/kdesktop/init/Trash b/kdesktop/init/Trash
new file mode 100644
index 000000000..2dcee0299
--- /dev/null
+++ b/kdesktop/init/Trash
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Link
+URL=trash:/
+Encoding=UTF-8
+Icon=trashcan_full
+EmptyIcon=trashcan_empty
+Name=Trash
+Comment=Contains removed files 
diff --git a/kdesktop/init/Web_Browser b/kdesktop/init/Web_Browser
new file mode 100644
index 000000000..27fedec39
--- /dev/null
+++ b/kdesktop/init/Web_Browser
@@ -0,0 +1,18 @@
+[Desktop Entry]
+Comment=Browse the World Wide Web
+Comment[en_US]=Browse the World Wide Web
+Exec=kfmclient exec http://www.google.com %u
+GenericName=Web Browser
+GenericName[en_US]=Web Browser
+Icon=konqueror
+MimeType=application/vnd.mozilla.xul+xml;application/xhtml+xml;application/xml;image/gif;image/jpeg;image/png;text/html;text/xml
+Name=Web Browser
+Name[en_US]=Web Browser
+Path=
+StartupNotify=true
+Terminal=false
+TerminalOptions=
+Type=Application
+X-DCOP-ServiceType=
+X-KDE-SubstituteUID=false
+X-KDE-Username=
diff --git a/kioslave/media/mimetypes/mycomputer.desktop b/kioslave/media/mimetypes/mycomputer.desktop
index a354f5033..d368c5307 100644
--- a/kioslave/media/mimetypes/mycomputer.desktop
+++ b/kioslave/media/mimetypes/mycomputer.desktop
@@ -3,6 +3,6 @@ Icon=system
 Type=MimeType
 MimeType=media/builtin-mycomputer
 Comment=My Computer
-Patterns=My Computer
+Patterns=My_Computer
 
 X-KDE-AutoEmbed=false
diff --git a/kioslave/media/mimetypes/mydocuments.desktop b/kioslave/media/mimetypes/mydocuments.desktop
index f9a8c261c..dd8a76c9a 100644
--- a/kioslave/media/mimetypes/mydocuments.desktop
+++ b/kioslave/media/mimetypes/mydocuments.desktop
@@ -3,6 +3,6 @@ Icon=folder_wordprocessing
 Type=MimeType
 MimeType=media/builtin-mydocuments
 Comment=My Documents
-Patterns=My Documents
+Patterns=My_Documents
 
 X-KDE-AutoEmbed=false
diff --git a/kioslave/media/mimetypes/mynetworkplaces.desktop b/kioslave/media/mimetypes/mynetworkplaces.desktop
index 3061dd160..003faad34 100644
--- a/kioslave/media/mimetypes/mynetworkplaces.desktop
+++ b/kioslave/media/mimetypes/mynetworkplaces.desktop
@@ -3,6 +3,6 @@ Icon=network
 Type=MimeType
 MimeType=media/builtin-mynetworkplaces
 Comment=My Network Places
-Patterns=My Network Places
+Patterns=My_Network_Places
 
 X-KDE-AutoEmbed=false
diff --git a/kioslave/media/mimetypes/webbrowser.desktop b/kioslave/media/mimetypes/webbrowser.desktop
index 0d495f0b6..18f028704 100644
--- a/kioslave/media/mimetypes/webbrowser.desktop
+++ b/kioslave/media/mimetypes/webbrowser.desktop
@@ -3,6 +3,6 @@ Icon=konqueror
 Type=MimeType
 MimeType=media/builtin-webbrowser
 Comment=Web Browser
-Patterns=Web Browser
+Patterns=Web_Browser
 
 X-KDE-AutoEmbed=false