diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1377554
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.swp
diff --git a/astronaut/astronaut b/astronaut/astronaut
index da36028..355f480 100755
--- a/astronaut/astronaut
+++ b/astronaut/astronaut
@@ -122,7 +122,7 @@ dlextract() {
 }
 
 extrafile() {
-    cp "$(dirname "$satellite")/$1" "$dir_build/$1"
+    cp "$(dirname "$satellite")/extrafiles/$name/$1" "$dir_build/$1"
 }
 
 do_check() {
diff --git a/astronaut/hello.sat b/astronaut/hello.sat
index 2a69726..dde4bb6 100644
--- a/astronaut/hello.sat
+++ b/astronaut/hello.sat
@@ -31,3 +31,5 @@ fi
 #do_check make check
 
 make DESTDIR="$dir_install" install
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/tools/satellites/astronaut.sat b/tools/satellites/astronaut.sat
index 659bd99..62010bd 100644
--- a/tools/satellites/astronaut.sat
+++ b/tools/satellites/astronaut.sat
@@ -2,3 +2,5 @@
 msg "Installing astronaut"
 
 install -Dm755 "$(command -v "$0")" "$dir_install/tools/bin/astronaut"
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/tools/satellites/binutils-1.sat b/tools/satellites/binutils-1.sat
index cd3dd6d..c1a7dd4 100644
--- a/tools/satellites/binutils-1.sat
+++ b/tools/satellites/binutils-1.sat
@@ -21,3 +21,5 @@ case $(uname -m) in
 esac
 
 make DESTDIR="$dir_install" install
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/tools/satellites/binutils-2.sat b/tools/satellites/binutils-2.sat
index 50b811b..7182e91 100644
--- a/tools/satellites/binutils-2.sat
+++ b/tools/satellites/binutils-2.sat
@@ -21,3 +21,5 @@ make; make DESTDIR="$dir_install" install
 make -C ld clean
 make -C ld LIB_PATH=/usr/lib:/lib
 cp ld/ld-new "$dir_install/tools/bin/ld-new"
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/tools/satellites/busybox.sat b/tools/satellites/busybox.sat
index cb98212..d2a0416 100644
--- a/tools/satellites/busybox.sat
+++ b/tools/satellites/busybox.sat
@@ -9,3 +9,5 @@ cat busybox.config | sed 's@./_install@'"$dir_install/tools"'@' > "$name-$versio
 cd "$name-$version"
 
 make; make install
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/tools/satellites/busybox.config b/tools/satellites/extrafiles/busybox/busybox.config
similarity index 100%
rename from tools/satellites/busybox.config
rename to tools/satellites/extrafiles/busybox/busybox.config
diff --git a/tools/satellites/extrafiles/stow/fix-warning-message-perl5.20.patch b/tools/satellites/extrafiles/stow/fix-warning-message-perl5.20.patch
new file mode 100644
index 0000000..d7c12a8
--- /dev/null
+++ b/tools/satellites/extrafiles/stow/fix-warning-message-perl5.20.patch
@@ -0,0 +1,12 @@
+# https://projects.archlinux.org/svntogit/community.git/plain/trunk/01-fix-warning-message-perl5.20.patch?h=packages/stow
+--- a/lib/Stow.pm.in	2012-02-18 20:33:34.000000000 +0000
++++ b/lib/Stow.pm.in	2014-06-08 22:46:03.420893651 +0100
+@@ -1732,7 +1732,7 @@
+     }
+     elsif (-l $path) {
+         debug(4, "  read_a_link($path): real link");
+-        return readlink $path
++        (return readlink $path)
+             or error("Could not read link: $path");
+     }
+     internal_error("read_a_link() passed a non link path: $path\n");
diff --git a/tools/satellites/gcc-1.sat b/tools/satellites/gcc-1.sat
index a17296a..24e775b 100644
--- a/tools/satellites/gcc-1.sat
+++ b/tools/satellites/gcc-1.sat
@@ -66,3 +66,5 @@ mkdir "../$name-build"; cd "../$name-build"
     --enable-languages=c,c++
 
 make; make DESTDIR="$dir_install" install
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/tools/satellites/gcc-2.sat b/tools/satellites/gcc-2.sat
index aceef43..b89f60e 100644
--- a/tools/satellites/gcc-2.sat
+++ b/tools/satellites/gcc-2.sat
@@ -60,3 +60,5 @@ RANLIB="$target-ranlib" \
 
 make; make DESTDIR="$dir_install" install
 ln -s gcc "$dir_install/tools/bin/cc"
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/tools/satellites/glibc.sat b/tools/satellites/glibc.sat
index 4396b02..c8c3822 100644
--- a/tools/satellites/glibc.sat
+++ b/tools/satellites/glibc.sat
@@ -18,3 +18,5 @@ mkdir "$name-build"; cd "$name-build"
     libc_cv_c_cleanup=yes
 
 make; make DESTDIR="$dir_install" install
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/tools/satellites/libstdc.sat b/tools/satellites/libstdc.sat
index 3bba1f8..bd455de 100644
--- a/tools/satellites/libstdc.sat
+++ b/tools/satellites/libstdc.sat
@@ -17,3 +17,5 @@ mkdir "$name-build"; cd "$name-build"
     --with-gxx-include-dir="/tools/$target/include/c++/$version"
 
 make; make DESTDIR="$dir_install" install
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/tools/satellites/linux-api.sat b/tools/satellites/linux-api.sat
index b5ed394..7a5caa0 100644
--- a/tools/satellites/linux-api.sat
+++ b/tools/satellites/linux-api.sat
@@ -8,3 +8,5 @@ cd "$name-$version"
 
 make mrproper
 make INSTALL_HDR_PATH="$dir_install/tools" headers_install
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/tools/satellites/make.sat b/tools/satellites/make.sat
index 2d44239..0088ea6 100644
--- a/tools/satellites/make.sat
+++ b/tools/satellites/make.sat
@@ -8,3 +8,5 @@ cd "$name-$version"
 
 ./configure --prefix=/tools --without-guile
 make; make DESTDIR="$dir_install" install
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/tools/satellites/perl.sat b/tools/satellites/perl.sat
index 01b75dc..a5852f3 100644
--- a/tools/satellites/perl.sat
+++ b/tools/satellites/perl.sat
@@ -12,3 +12,5 @@ make
 cp perl "$dir_install/tools/bin"
 mkdir -p "$dir_install/tools/lib/perl5"
 cp -r lib "$dir_install/tools/lib/perl5/$version"
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/tools/satellites/stow.sat b/tools/satellites/stow.sat
index 2e1a64d..d1b99e6 100644
--- a/tools/satellites/stow.sat
+++ b/tools/satellites/stow.sat
@@ -3,8 +3,13 @@ version=2.2.0
 
 dlextract "http://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2" \
           "5bb56592eff9aaf9dfb6c975b3004240"
+extrafile "fix-warning-message-perl5.20.patch"
+
+patch -p1 -i "fix-warning-message-perl5.20.patch" -d "$name-$version"
 
 cd "$name-$version"
 
 ./configure --prefix=/tools
 make DESTDIR="$dir_install" install-exec-am install-pmDATA install-dist_pmstowDATA
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh et: