diff --git a/debian/changelog b/debian/changelog
index 3f4ddaf..09c1bb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ lubuntu-default-settings (0.21) UNRELEASED; urgency=low
     Remove them on uninstall. (thanks Didier and Lionel !)
   * etc/xdg/lubuntu/lxdm/lxdm.conf:
    - Fix location of the background.
+  * usr/bin/startlubuntu* & usr/share/lubuntu/leafpad/
+   - Install specific settings for leafpad, with Ubuntu font by default.
 
  -- Julien Lavergne <gilir@ubuntu.com>  Tue, 16 Aug 2011 01:11:02 +0200
 
diff --git a/usr/bin/startlubuntu b/usr/bin/startlubuntu
index 262d5a1..1f0f367 100644
--- a/usr/bin/startlubuntu
+++ b/usr/bin/startlubuntu
@@ -39,6 +39,13 @@ if [ ! -f "$XDG_CONFIG_HOME/Trolltech.conf" ]; then
     cp /usr/share/lubuntu/qt/Trolltech.conf "$XDG_CONFIG_HOME/Trolltech.conf"
 fi
 
+# Install custom configuration for leafpad
+LEAFPAD_CONF_DIR="$XDG_CONFIG_HOME/leafpad"
+if [ ! -f "$LEAFPAD_CONF_DIR/leafpadrc" ]; then
+    mkdir -p "$LEAFPAD_CONF_DIR"
+    cp /usr/share/lubuntu/leafpad/leafpadrc "$LEAFPAD_CONF_DIR/leafpadrc"
+fi
+
 # Clean up after GDM (GDM sets the number of desktops to one)
 xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
 
diff --git a/usr/bin/startlubuntu-netbook b/usr/bin/startlubuntu-netbook
index 5ab49f5..8a953c2 100644
--- a/usr/bin/startlubuntu-netbook
+++ b/usr/bin/startlubuntu-netbook
@@ -39,6 +39,13 @@ if [ ! -f "$XDG_CONFIG_HOME/Trolltech.conf" ]; then
     cp /usr/share/lubuntu/qt/Trolltech.conf "$XDG_CONFIG_HOME/Trolltech.conf"
 fi
 
+# Install custom configuration for leafpad
+LEAFPAD_CONF_DIR="$XDG_CONFIG_HOME/leafpad"
+if [ ! -f "$LEAFPAD_CONF_DIR/leafpadrc" ]; then
+    mkdir -p "$LEAFPAD_CONF_DIR"
+    cp /usr/share/lubuntu/leafpad/leafpadrc "$LEAFPAD_CONF_DIR/leafpadrc"
+fi
+
 # Clean up after GDM (GDM sets the number of desktops to one)
 xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
 
diff --git a/usr/share/lubuntu/leafpad/leafpadrc b/usr/share/lubuntu/leafpad/leafpadrc
new file mode 100644
index 0000000..33a1089
--- /dev/null
+++ b/usr/share/lubuntu/leafpad/leafpadrc
@@ -0,0 +1,7 @@
+0.8.17
+600
+400
+Ubuntu 11
+0
+0
+0