diff --git a/satellites/compton-git.sat b/satellites/compton-git.sat
index 6aa4fa7..02d69fb 100644
--- a/satellites/compton-git.sat
+++ b/satellites/compton-git.sat
@@ -10,7 +10,7 @@ make install \
     DESTDIR="$dir_install" \
     PREFIX="/$dir_prefix" \
     BINDIR="/$dir_prefix/$dir_bindir" \
-    MANDIR="/$dir_prefix/$dir_mandir" \
+    MANDIR="/$dir_prefix/$dir_mandir/man1" \
     APPDIR="/$dir_prefix/$dir_datadir/applications" \
     ICODIR="/$dir_prefix/$dir_datadir/icons/hicolor"
 
diff --git a/satellites/luajit.sat b/satellites/luajit.sat
index d89344f..d8c3f80 100644
--- a/satellites/luajit.sat
+++ b/satellites/luajit.sat
@@ -16,7 +16,7 @@ make install \
     MULTILIB="$dir_libdir" \
     INSTALL_BIN="\$(DPREFIX)/$dir_bindir" \
     INSTALL_SHARE="\$(DPREFIX)/$dir_datadir" \
-    INSTALL_MAN="\$(DPREFIX)/$dir_mandir" \
+    INSTALL_MAN="\$(DPREFIX)/$dir_mandir/man1" \
     INSTALL_INC="\$(DPREFIX)/$dir_includedir/luajit-\$(MAJVER).\$(MINVER)"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/python3.sat b/satellites/python3.sat
index abe1bc2..22e3f62 100644
--- a/satellites/python3.sat
+++ b/satellites/python3.sat
@@ -12,6 +12,17 @@ header_end
 
 cd "$name-$version"
 
+# Don't build the static library
+sed -i -e '/$(BUILDPYTHON):/s/$(LIBRARY)//' \
+       -e '/Programs\/_testembed:/s/$(LIBRARY)//' \
+       -e '/test -d $(LIBRARY)/c\	@if false; then \\' Makefile.pre.in
+
+# Don't install the 2to3 symlink, as that conflicts with python 2
+option !2to3-symlink sed -i -e '/$(LN) -s 2to3/d' Makefile.pre.in
+
+# Remove windows binaries and scripts
+find Lib \( -name '*.exe' -o -name '*.bat' \) -delete
+
 # Fix paths
 sed -i -e "/os.path.join(prefix/s/lib/$(safe_sed "$dir_libdir")/" Lib/site.py
 sed -i -e "s/\/lib\/python/$(safe_sed "/$dir_libdir/python")/" \
@@ -23,17 +34,6 @@ sed -i -e "/lib_python =/s/lib\//$(safe_sed "$dir_libdir")\//" Modules/getpath.c
 sed -i -e "/SCRIPTDIR=/s/lib/$(safe_sed "$dir_libdir")/" Makefile.pre.in
 sed -i -e "/LIBPL=/s/lib/$(safe_sed "$dir_libdir")/" configure
 
-# Remove windows binaries and scripts
-find Lib \( -name '*.exe' -o -name '*.bat' \) -delete
-
-# Don't build the static library
-sed -i -e '/$(BUILDPYTHON):/s/$(LIBRARY)//' \
-       -e '/Programs\/_testembed:/s/$(LIBRARY)//' \
-       -e '/test -d $(LIBRARY)/c\	@if false; then \\' Makefile.pre.in
-
-# Don't install the 2to3 symlink, as that conflicts with python 2
-option !2to3-symlink sed -i -e '/$(LN) -s 2to3/d' Makefile.pre.in
-
 compile_configure -- \
     --enable-shared \
     --with-threads \