diff --git a/debian/changelog b/debian/changelog
index 36e20d4..1fb12d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ lubuntu-default-settings (0.27) UNRELEASED; urgency=low
   [ Bhaskar Kandiyal ]
   * Changed default theme of lightdm to Lubuntu-default (LP: #968527)
 
+  [ Julien Lavergne ]
+  * usr/share/lubuntu/openbox/rc.xml:
+   - Remove entries in the openbox menu which hang up if launched before
+     pcmanfm first run.
+
  -- Julien Lavergne <gilir@ubuntu.com>  Sun, 01 Apr 2012 15:48:36 +0200
 
 lubuntu-default-settings (0.26) precise; urgency=low
diff --git a/usr/share/lubuntu/openbox/menu.xml b/usr/share/lubuntu/openbox/menu.xml
index 1b44916..4bf7475 100644
--- a/usr/share/lubuntu/openbox/menu.xml
+++ b/usr/share/lubuntu/openbox/menu.xml
@@ -147,18 +147,6 @@
 </menu>
 
 <menu id="system-menu" label="System">
-  <item label="System Preferences">
-    <action name="Execute">
-      <command>pcmanfm menu://applications/DesktopSettings</command>
-      <startupnotify><enabled>yes</enabled></startupnotify>
-    </action>
-  </item>
-  <item label="Administration">
-    <action name="Execute">
-      <command>pcmanfm menu://applications/Administration</command>
-      <startupnotify><enabled>yes</enabled></startupnotify>
-    </action>
-  </item>
   <item label="Desktop Settings">
     <action name="Execute">
       <command>pcmanfm --desktop-pref</command>