diff --git a/astronaut/astronaut b/astronaut/astronaut
index 7d5281c..80e1539 100755
--- a/astronaut/astronaut
+++ b/astronaut/astronaut
@@ -20,7 +20,7 @@ dir_prefix='/usr'  # Prefix directory (for /bin, /lib, /include, /share and such
 dir_bindir='bin'
 dir_sbindir='sbin'
 dir_libdir='lib'
-dir_libexecdir='lib'
+dir_libexecdir='libexec'
 dir_mandir='share/man'
 dir_docdir='share/doc'
 dir_infodir='share/info'
diff --git a/astronaut/astronautpkg b/astronaut/astronautpkg
index fb6b9d0..60f8da5 100755
--- a/astronaut/astronautpkg
+++ b/astronaut/astronautpkg
@@ -19,9 +19,11 @@ _nuke_dir_install=true
 
 . "$_astronaut"
 
+# Gzip man and info pages
+[ -d "$dir_install/$dir_prefix/$dir_mandir" ] && gzip -9 -r "$dir_install/$dir_prefix/$dir_mandir"
+[ -d "$dir_install/$dir_prefix/$dir_infodir" ] && gzip -9 -r "$dir_install/$dir_prefix/$dir_infodir"
+
 # _dir_pkgtools should be set from a configuration file (e.g. ~/.astronaut.conf), and points to wherever you want your packages to be placed.
 [ "$dir_wrapper_pkgtools" ] && mkdir -p "$dir_wrapper_pkgtools" || dir_wrapper_pkgtools="$_topdir"
 cd "$dir_install"
-[ -d usr/share/man ] && gzip -9 -r usr/share/man
-[ -d usr/man ] && gzip -9 -r usr/man
 PATH=$PATH:/sbin "$_fakeroot" makepkg -l y -c n "$dir_wrapper_pkgtools/$name-$version-$(uname -m)-astro.tgz"