diff --git a/debian/changelog b/debian/changelog
index 193cd10..b6ec5bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 lubuntu-default-settings (0.7) UNRELEASED; urgency=low
 
-  * debian/control: Depends on the re-written pcmanfm2 (>= 0.7.0)
+  * debian/control: 
+   - Depends on the re-written pcmanfm2 (>= 0.7.0)
+   - Wrap build-depends and depends.
   * autostart: 
    - Use new pcmanfm --desktop command to start pcmanfm with desktop management
   * Use pcmanfm2.desktop in lxpanel panel settings.
@@ -8,6 +10,10 @@ lubuntu-default-settings (0.7) UNRELEASED; urgency=low
    - Install a custom preferences file for Chromium.
    - Ensure the menu prefix
   * openbox/menu.xml : Use new command to launch desktop settings. 
+  * etc/xdg/lubuntu/lxdm/lxdm.conf
+   - Make Lubuntu the default session by using the [base] session key.
+   - Remove last_*, not provided by lxdm.conf in recent lxdm version.
+   - Put "username" in the autologin key.
 
  -- Julien Lavergne <gilir@ubuntu.com>  Sat, 20 Mar 2010 10:58:33 +0100
 
diff --git a/debian/control b/debian/control
index 620bb22..b27ba8f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: lubuntu-default-settings
 Section: x11
 Priority: optional
 Maintainer: Julien Lavergne <gilir@ubuntu.com>
-Build-Depends: debhelper (>= 7), intltool
+Build-Depends: debhelper (>= 7), 
+               intltool
 Standards-Version: 3.8.3
 Homepage: https://launchpad.net/~lubuntu-desktop
 Vcs-Bzr: lp:~lubuntu-desktop/+junk/lubuntu-default-settings
@@ -10,6 +11,10 @@ Vcs-Browser: http://bazaar.launchpad.net/~lubuntu-desktop/+junk/lubuntu-default-
 
 Package: lubuntu-default-settings
 Architecture: all
-Depends: ${misc:Depends}, lxsession (>= 0.4.1), lubuntu-artwork (>= 0.4), elementary-icon-theme, pcmanfm2 (>= 0.7.0)
+Depends: ${misc:Depends}, 
+         lxsession (>= 0.4.1), 
+         lubuntu-artwork (>= 0.4), 
+         elementary-icon-theme,
+         pcmanfm2 (>= 0.7.0)
 Description: default settings for Lubuntu
  Various system settings tailored for Lubuntu.
diff --git a/etc/xdg/lubuntu/lxdm/lxdm.conf b/etc/xdg/lubuntu/lxdm/lxdm.conf
index 2c0c1c6..2cf5dee 100644
--- a/etc/xdg/lubuntu/lxdm/lxdm.conf
+++ b/etc/xdg/lubuntu/lxdm/lxdm.conf
@@ -1,13 +1,9 @@
 [base]
-# autologin=dgod
-# session=/usr/bin/startlubuntu
+# autologin=username
+session=/usr/bin/startlubuntu
 # numlock=0
 greeter=/usr/lib/lxdm/lxdm-greeter-gtk
 
-last_session=Lubuntu.desktop
-
-last_lang=
-
 [server]
 # arg=/usr/bin/X -nr vt1