diff --git a/scripts/dconfig.txt b/scripts/dconfig.txt
index d485a1ccb..fcabcd7c4 100644
--- a/scripts/dconfig.txt
+++ b/scripts/dconfig.txt
@@ -67,6 +67,7 @@ default-size-columns=160
 
 [org/gnome/desktop/background]
 show-desktop-icons=false
+picture-uri='file:///usr/share/backgrounds/01/wallpaper.png'
 
 [org/gnome/desktop/peripherals/mouse]
 accel-profile='flat'
diff --git a/scripts/install_client.sh b/scripts/install_client.sh
index d3f10f9c9..59101a374 100755
--- a/scripts/install_client.sh
+++ b/scripts/install_client.sh
@@ -83,6 +83,11 @@ find . -type f -exec /bin/sh -c "file {} | grep -q 'public key' && chmod 400 {}"
 
 sed -i -e "s|::DISK::|$DISK|g" etc/udev/rules.d/10-local.rules
 
+# Generate wallpaper
+cd usr/share/backgrounds/01
+test ! -e wallpaper.png && composite logo.png background.png wallpaper.png
+cd /tmp/system
+
 cp --preserve=mode -RT . /
 
 cd $SCRIPT_DIR
diff --git a/scripts/system/usr/share/backgrounds/01/background.png b/scripts/system/usr/share/backgrounds/01/background.png
new file mode 100644
index 000000000..2a06dfb7b
Binary files /dev/null and b/scripts/system/usr/share/backgrounds/01/background.png differ
diff --git a/scripts/system/usr/share/backgrounds/01/logo.png b/scripts/system/usr/share/backgrounds/01/logo.png
new file mode 100644
index 000000000..719b8a659
Binary files /dev/null and b/scripts/system/usr/share/backgrounds/01/logo.png differ