diff --git a/eu_US (ANSI).keylayout b/Keyboard Layouts/eu_US (ANSI).keylayout
similarity index 100%
rename from eu_US (ANSI).keylayout
rename to Keyboard Layouts/eu_US (ANSI).keylayout
diff --git a/eu_US.keylayout b/Keyboard Layouts/eu_US.keylayout
similarity index 100%
rename from eu_US.keylayout
rename to Keyboard Layouts/eu_US.keylayout
diff --git a/setup.sh b/setup.sh
index 36bab5d..d52e70a 100755
--- a/setup.sh
+++ b/setup.sh
@@ -60,8 +60,8 @@ if have ssh; then
 fi
 
 if test x"$(uname -s)" = x"Darwin"; then
-	for i in eu_US.keylayout "eu_US (ANSI).keylayout"; do
-		dest="$HOME/Library/Keyboard Layouts/$i"
+	for i in "Keyboard Layouts/*"; do
+		dest="$HOME/Library/$i"
 		# This does not like being symlinked…
 		if [ ! -e "$dest" ]; then
 			echo "Hardlinking $i -> $dest"