diff --git a/.etckeeper b/.etckeeper
index 02c13d1..6f19dc8 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -293,6 +293,7 @@ maybe chmod 0755 'init.d/nfs-common'
 maybe chmod 0755 'init.d/paxctld'
 maybe chmod 0755 'init.d/procps'
 maybe chmod 0755 'init.d/raspi-config'
+maybe chmod 0755 'init.d/resize2fs_once'
 maybe chmod 0755 'init.d/rng-tools'
 maybe chmod 0755 'init.d/rpcbind'
 maybe chmod 0755 'init.d/rsync'
@@ -610,7 +611,7 @@ maybe chmod 0755 'wpa_supplicant'
 maybe chmod 0755 'wpa_supplicant/action_wpa.sh'
 maybe chmod 0644 'wpa_supplicant/functions.sh'
 maybe chmod 0755 'wpa_supplicant/ifupdown.sh'
-maybe chmod 0600 'wpa_supplicant/wpa_supplicant.conf'
+maybe chmod 0644 'wpa_supplicant/wpa_supplicant.conf'
 maybe chmod 0644 'xattr.conf'
 maybe chmod 0755 'xdg'
 maybe chmod 0755 'xdg/autostart'
diff --git a/default/locale b/default/locale
index f99e162..f14e294 100644
--- a/default/locale
+++ b/default/locale
@@ -1,2 +1,2 @@
 #  File generated by update-locale
-LANG=en_GB.UTF-8
+LANG=de_DE.UTF-8
diff --git a/hostname b/hostname
index 41757af..9c60af2 100644
--- a/hostname
+++ b/hostname
@@ -1 +1 @@
-raspberrypi
+mypi
diff --git a/hosts b/hosts
index 611289d..454b78e 100644
--- a/hosts
+++ b/hosts
@@ -3,4 +3,4 @@
 ff02::1		ip6-allnodes
 ff02::2		ip6-allrouters
 
-127.0.1.1		raspberrypi
+127.0.1.1	mypi
diff --git a/init.d/resize2fs_once b/init.d/resize2fs_once
new file mode 100755
index 0000000..f9110d4
--- /dev/null
+++ b/init.d/resize2fs_once
@@ -0,0 +1,26 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          resize2fs_once
+# Required-Start:
+# Required-Stop:
+# Default-Start: 3
+# Default-Stop:
+# Short-Description: Resize the root filesystem to fill partition
+# Description:
+### END INIT INFO
+
+. /lib/lsb/init-functions
+
+case "$1" in
+  start)
+    log_daemon_msg "Starting resize2fs_once" &&
+    resize2fs "/dev/mmcblk0p2" &&
+    update-rc.d resize2fs_once remove &&
+    rm /etc/init.d/resize2fs_once &&
+    log_end_msg $?
+    ;;
+  *)
+    echo "Usage: $0 start" >&2
+    exit 3
+    ;;
+esac
diff --git a/locale.gen b/locale.gen
index f575e9f..cc008de 100644
--- a/locale.gen
+++ b/locale.gen
@@ -113,7 +113,7 @@
 # de_CH ISO-8859-1
 # de_CH.UTF-8 UTF-8
 # de_DE ISO-8859-1
-# de_DE.UTF-8 UTF-8
+de_DE.UTF-8 UTF-8
 # de_DE@euro ISO-8859-15
 # de_IT ISO-8859-1
 # de_IT.UTF-8 UTF-8
@@ -142,7 +142,7 @@
 # en_DK.UTF-8 UTF-8
 # en_GB ISO-8859-1
 # en_GB.ISO-8859-15 ISO-8859-15
-en_GB.UTF-8 UTF-8
+# en_GB.UTF-8 UTF-8
 # en_HK ISO-8859-1
 # en_HK.UTF-8 UTF-8
 # en_IE ISO-8859-1
diff --git a/localtime b/localtime
index cb3aa84..622b45b 120000
--- a/localtime
+++ b/localtime
@@ -1 +1 @@
-/usr/share/zoneinfo/Europe/London
\ No newline at end of file
+/usr/share/zoneinfo/Europe/Berlin
\ No newline at end of file
diff --git a/rc3.d/S01resize2fs_once b/rc3.d/S01resize2fs_once
new file mode 120000
index 0000000..6772e39
--- /dev/null
+++ b/rc3.d/S01resize2fs_once
@@ -0,0 +1 @@
+../init.d/resize2fs_once
\ No newline at end of file
diff --git a/timezone b/timezone
index 5ad2f14..94d5acc 100644
--- a/timezone
+++ b/timezone
@@ -1 +1 @@
-Europe/London
+Europe/Berlin
diff --git a/wpa_supplicant/wpa_supplicant.conf b/wpa_supplicant/wpa_supplicant.conf
index 0fc335e..0a78863 100644
--- a/wpa_supplicant/wpa_supplicant.conf
+++ b/wpa_supplicant/wpa_supplicant.conf
@@ -1,2 +1,3 @@
 ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev
 update_config=1
+country=DE