diff --git a/debian/changelog b/debian/changelog
index 93db977..7fc96e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ lubuntu-default-settings (0.32) UNRELEASED; urgency=low
   * usr/share/lubuntu/openbox/rc.xml
   * usr/share/lubuntu/pcmanfm/main.lubuntu
    - Use lxsession-default for terminal, screenshot and quit.
+  * usr/share/lubuntu/pcmanfm/main.lubuntu
+  * etc/xdg/lubuntu/libfm/libfm.conf
+   - Rebase with new upstream options.
 
  -- Julien Lavergne <gilir@ubuntu.com>  Wed, 20 Mar 2013 23:23:40 +0100
 
diff --git a/etc/xdg/lubuntu/libfm/libfm.conf b/etc/xdg/lubuntu/libfm/libfm.conf
index 9504526..0c5ebb1 100644
--- a/etc/xdg/lubuntu/libfm/libfm.conf
+++ b/etc/xdg/lubuntu/libfm/libfm.conf
@@ -2,6 +2,20 @@
 single_click=0
 use_trash=1
 confirm_del=1
+confirm_trash=1
+advanced_mode=0
+si_unit=0
+force_startup_notify=1
+backup_as_hidden=1
+no_usb_trash=0
+no_child_non_expandable=0
+show_full_names=0
+only_user_templates=0
+template_run_app=0
+template_type_once=0
+auto_selection_delay=600
+drop_default_action=0
+show_internal_volumes=0
 terminal=lubuntu-default terminal %s
 thumbnail_local=1
 thumbnail_max=2048
@@ -12,3 +26,9 @@ small_icon_size=24
 pane_icon_size=16
 thumbnail_size=128
 show_thumbnail=1
+
+[places]
+places_home=1
+places_desktop=1
+places_trash=1
+places_applications=1
diff --git a/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf b/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf
index 1294800..20f7c59 100644
--- a/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf
+++ b/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf
@@ -2,19 +2,30 @@
 bm_open_method=0
 su_cmd=gksu %s
 
+[volume]
+mount_on_startup=1
+mount_removable=1
+autorun=1
+
 [desktop]
 wallpaper_mode=1
+wallpaper_common=1
+wallpapers_configured=1
 wallpaper=/usr/share/lubuntu/wallpapers/lubuntu-default-wallpaper.png
 desktop_bg=#000000
 desktop_fg=#ffffff
 desktop_shadow=#000000
 desktop_font=Ubuntu 11
+show_wm_menu=0
+sort_type=0
+sort_by=7
 
 [ui]
 always_show_tabs=0
-hide_close_btn=0
+max_tab_chars=32
 win_width=798
 win_height=547
+side_pane_mode=1
 view_mode=0
 show_hidden=0
 sort_type=0