diff --git a/gebner-base/.SRCINFO b/gebner-base/.SRCINFO
index 4312f01..6faf049 100644
--- a/gebner-base/.SRCINFO
+++ b/gebner-base/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gebner-base
 	pkgdesc = Base system config
-	pkgver = 4
+	pkgver = 5
 	pkgrel = 1
 	url = https://git.gebner.org/gebner/archpkgs
 	install = gebner-base.install
diff --git a/gebner-base/PKGBUILD b/gebner-base/PKGBUILD
index 9b40a73..d02d155 100644
--- a/gebner-base/PKGBUILD
+++ b/gebner-base/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Gabriel Ebner <gebner@gebner.org>
 pkgname=gebner-base
-pkgver=4
+pkgver=5
 pkgrel=1
 pkgdesc="Base system config"
 arch=(any)
@@ -77,6 +77,7 @@ depends+=(
   socat
   openbsd-netcat
   whois
+  inetutils
 
   dstat
   htop
diff --git a/gebner-base/files/etc/system/mnt-aplysia.automount b/gebner-base/files/etc/systemd/system/mnt-aplysia.automount
similarity index 100%
rename from gebner-base/files/etc/system/mnt-aplysia.automount
rename to gebner-base/files/etc/systemd/system/mnt-aplysia.automount
diff --git a/gebner-base/files/etc/system/mnt-aplysia.mount b/gebner-base/files/etc/systemd/system/mnt-aplysia.mount
similarity index 100%
rename from gebner-base/files/etc/system/mnt-aplysia.mount
rename to gebner-base/files/etc/systemd/system/mnt-aplysia.mount
diff --git a/gebner-base/files/etc/system/mnt-vaccaria.automount b/gebner-base/files/etc/systemd/system/mnt-vaccaria.automount
similarity index 100%
rename from gebner-base/files/etc/system/mnt-vaccaria.automount
rename to gebner-base/files/etc/systemd/system/mnt-vaccaria.automount
diff --git a/gebner-base/files/etc/system/mnt-vaccaria.mount b/gebner-base/files/etc/systemd/system/mnt-vaccaria.mount
similarity index 100%
rename from gebner-base/files/etc/system/mnt-vaccaria.mount
rename to gebner-base/files/etc/systemd/system/mnt-vaccaria.mount
diff --git a/gebner-base/gebner-base.install b/gebner-base/gebner-base.install
index 7e30f37..6a14345 100644
--- a/gebner-base/gebner-base.install
+++ b/gebner-base/gebner-base.install
@@ -1,10 +1,12 @@
 post_install() {
     post_upgrade
     ln -s ../usr/share/zoneinfo/Europe/Amsterdam /etc/localtime
+    echo "LANG=en_US.UTF-8" > /etc/locale.conf
 }
 
 post_upgrade() {
-    echo "LANG=en_US.UTF-8" > /etc/locale.conf
-    sed 's/#\(en_US.UTF-8\)/\1/' -i /etc/locale.gen
+    for lang in en_US.UTF-8 de_AT.UTF-8 nl_NL.UTF-8 ja_JP.UTF-8; do
+      sed 's/#\('$lang'\)/\1/' -i /etc/locale.gen
+    done
     locale-gen
 }