diff --git a/usr/bin/arch-create-system b/usr/bin/arch-create-system
index 93932c8..47651bb 100755
--- a/usr/bin/arch-create-system
+++ b/usr/bin/arch-create-system
@@ -595,6 +595,12 @@ install_target_packages () {
     printf "${BLUE}Install target packages ${GREEN}'%s' -> '%s'${NO_COLOR}\n" \
 	   "$LABEL" "$MOUNT_POINT"
 
+    # Find fast mirror
+    # TODO: Aachen
+    sed '1 i\
+Server = http://ftp.halifax.rwth-aachen.de/archlinux/$repo/os/$arch' \
+	/etc/pacman.d/mirrorlist
+
     # Update available packages
     cmd="pacman -Sy"
     if [ $dryrun -eq 1 ]; then
@@ -622,7 +628,7 @@ install_target_packages () {
     fi
 
     # SSH-Daemon, FileManager and Editor
-    cmd="pacstrap $MOUNT_POINT dropbear vim mc bash-completion n"
+    cmd="pacstrap $MOUNT_POINT dropbear vim mc bash-completion"
     if [ $dryrun -eq 1 ]; then
 	printf "${MAGENTA}Would run ${GREEN}'%s'${NO_COLOR}\n" "$cmd"
     else