diff --git a/Makefile b/Makefile
index ce2b04225eb3f17c35ef64e3615ed72185057ac7..f3c9692bdcf17f71aad576e7a37bfd7f95f81822 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-V=20151129
+V=20160527.1
 
 PREFIX = /usr/local
 
@@ -112,6 +112,7 @@ dist:
 	gpg --detach-sign --use-agent devtools-$(V).tar.gz
 
 upload:
-	scp devtools-$(V).tar.gz devtools-$(V).tar.gz.sig nymeria.archlinux.org:/srv/ftp/other/devtools/
+	scp devtools-$(V).tar.gz devtools-$(V).tar.gz.sig repos.archlinux.org:/srv/ftp/other/devtools/
 
 .PHONY: all clean install uninstall dist upload
+
diff --git a/archco.in b/archco.in
index 5bdc4e6b03135f78279b64e8da12b3d1b810698b..2a5892123235d04577ccb1f265a3e0952b14681b 100644
--- a/archco.in
+++ b/archco.in
@@ -11,9 +11,9 @@ fi
 
 case $scriptname in
 	archco)
-		SVNURL="svn+ssh://svn-packages@nymeria.archlinux.org/srv/repos/svn-packages/svn";;
+		SVNURL="svn+ssh://svn-packages@repos.archlinux.org/srv/repos/svn-packages/svn";;
 	communityco)
-		SVNURL="svn+ssh://svn-community@nymeria.archlinux.org/srv/repos/svn-community/svn";;
+		SVNURL="svn+ssh://svn-community@repos.archlinux.org/srv/repos/svn-community/svn";;
 	*)
 		die "Couldn't find svn url for %s" "$scriptname"
 		;;
diff --git a/commitpkg.in b/commitpkg.in
index d779e96f104720c966dc205e8a155878a86ed940..3b3246b168f895724f2f5cad74c2839cf9cf47c7 100644
--- a/commitpkg.in
+++ b/commitpkg.in
@@ -92,7 +92,7 @@ for _arch in ${arch[@]}; do
 done
 
 if [[ -z $server ]]; then
-	server='nymeria.archlinux.org'
+	server='repos.archlinux.org'
 fi
 
 if [[ -n $(svn status -q) ]]; then
diff --git a/crossrepomove.in b/crossrepomove.in
index 912504f204253fadd75bf64b4263b5a4226a147f..d0964e384ebf5458aaa4a557c1efff91da1417db 100644
--- a/crossrepomove.in
+++ b/crossrepomove.in
@@ -29,7 +29,7 @@ case $scriptname in
 		;;
 esac
 
-server='nymeria.archlinux.org'
+server='repos.archlinux.org'
 source_svn="svn+ssh://svn-${source_name}@${server}/srv/repos/svn-${source_name}/svn"
 target_svn="svn+ssh://svn-${target_name}@${server}/srv/repos/svn-${target_name}/svn"
 source_dbscripts="/srv/repos/svn-${source_name}/dbscripts"
diff --git a/mkarchroot.in b/mkarchroot.in
index 78384da0701175ef7f55619daecdd7694910f7be..4d8efb0d8a90f873e86e7e44ad03503c868e15bf 100644
--- a/mkarchroot.in
+++ b/mkarchroot.in
@@ -75,6 +75,8 @@ printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
 echo 'LANG=C' > "$working_dir/etc/locale.conf"
 echo "$CHROOT_VERSION" > "$working_dir/.arch-chroot"
 
+systemd-machine-id-setup --root="$working_dir"
+
 exec arch-nspawn \
 	${pac_conf:+-C "$pac_conf"} \
 	${makepkg_conf:+-M "$makepkg_conf"} \
diff --git a/rebuildpkgs.in b/rebuildpkgs.in
index 2f71c40add29859b30a4cbf8117eae7abfe04c36..fb192581b4de0ecac5c5bd996e5f1ac1275e6812 100644
--- a/rebuildpkgs.in
+++ b/rebuildpkgs.in
@@ -47,7 +47,7 @@ pkg_from_pkgbuild() {
 chrootdir="$1"; shift
 pkgs="$@"
 
-SVNPATH='svn+ssh://nymeria.archlinux.org/srv/repos/svn-packages/svn'
+SVNPATH='svn+ssh://repos.archlinux.org/srv/repos/svn-packages/svn'
 
 msg "Work will be done in $(pwd)/rebuilds"