diff --git a/astronaut/astronaut b/astronaut/astronaut
index 1607592..53abea9 100755
--- a/astronaut/astronaut
+++ b/astronaut/astronaut
@@ -192,7 +192,7 @@ getfile() {
 }
 
 extrafile() {
-    cp "$(dirname "$_satellite")/extrafiles/$_satname/$1" "$dir_build/$1"
+    cp "$(dirname "$_satellite")/extrafiles/$name/$1" "$dir_build/$1"
 }
 
 dlextract() {
diff --git a/astronaut/astronautpkg b/astronaut/astronautpkg
index 726d0ee..902d95f 100755
--- a/astronaut/astronautpkg
+++ b/astronaut/astronautpkg
@@ -4,7 +4,8 @@
 
 # This may also serve as an example on how you can wrap astronaut to package in any format.
 
-_fakeroot="$(command -v fakeroot && echo 'fakeroot' || true)"
+_fakeroot="$(command -v fakeroot || true)"
+[ "$_fakeroot" ] && _fakeroot='fakeroot'
 
 if [ ! "$_fakeroot" -a "$(id -u)" != "0" ]; then
     echo 'This script has to be run as root, or you need fakeroot installed.' 1>&2