diff --git a/debian/changelog b/debian/changelog
index 28e76f8..312c9a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ lubuntu-default-settings (0.23) UNRELEASED; urgency=low
    - Use scrot -u -b (focused window with border) for the screenshot of the 
      current window.
    - Add a shortcut for the power button.
+  * usr/bin/startlubuntu* & usr/share/lubuntu/xscreensaver/xscreensaver:
+   - Add a custom configuration file for xscreensaver, with blank mode by
+     default (LP: #578789).
 
  -- Julien Lavergne <gilir@ubuntu.com>  Tue, 15 Nov 2011 13:47:32 +0700
 
diff --git a/usr/bin/startlubuntu b/usr/bin/startlubuntu
index 1f0f367..b7b1a36 100644
--- a/usr/bin/startlubuntu
+++ b/usr/bin/startlubuntu
@@ -46,6 +46,11 @@ if [ ! -f "$LEAFPAD_CONF_DIR/leafpadrc" ]; then
     cp /usr/share/lubuntu/leafpad/leafpadrc "$LEAFPAD_CONF_DIR/leafpadrc"
 fi
 
+# Install custom configuration for xscreensaver
+if [ ! -f "$HOME/.xscreensaver" ]; then
+    cp /usr/share/lubuntu/xscreensaver/xscreensaver "$HOME/.xscreensaver"
+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 8a953c2..c9743e8 100644
--- a/usr/bin/startlubuntu-netbook
+++ b/usr/bin/startlubuntu-netbook
@@ -46,6 +46,11 @@ if [ ! -f "$LEAFPAD_CONF_DIR/leafpadrc" ]; then
     cp /usr/share/lubuntu/leafpad/leafpadrc "$LEAFPAD_CONF_DIR/leafpadrc"
 fi
 
+# Install custom configuration for xscreensaver
+if [ ! -f "$HOME/.xscreensaver" ]; then
+    cp /usr/share/lubuntu/xscreensaver/xscreensaver "$HOME/.xscreensaver"
+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/xscreensaver/xscreensaver b/usr/share/lubuntu/xscreensaver/xscreensaver
new file mode 100644
index 0000000..e4c7ad3
--- /dev/null
+++ b/usr/share/lubuntu/xscreensaver/xscreensaver
@@ -0,0 +1,2 @@
+mode:		blank
+