diff --git a/astronaut/astronaut b/astronaut/astronaut
index ec284c9..7558670 100755
--- a/astronaut/astronaut
+++ b/astronaut/astronaut
@@ -295,7 +295,7 @@ header_end() { :; }
 if [ "$_vcs_only" = true ]; then
     header_end() {
         if [ ! "$vcs_compile" = true ]; then
-            exit 1
+            exit 200
         fi
     }
 fi
@@ -366,5 +366,12 @@ for _satellite in "$@"; do
 
             _astronaut_wrapper_post
         fi
-    )
+    ) || {
+        code="$?"
+        if [ "$_vcs_only" = true -a "$code" = 200 ]; then
+            continue
+        else
+            exit "$code"
+        fi
+    }
 done
diff --git a/graveyard/unmaintained_satellites/qt5-declarative.sat b/graveyard/unmaintained_satellites/qt5-declarative.sat
index c9888fd..f1c4d05 100644
--- a/graveyard/unmaintained_satellites/qt5-declarative.sat
+++ b/graveyard/unmaintained_satellites/qt5-declarative.sat
@@ -2,13 +2,13 @@ import 'compile/qt'
 
 name=qt5
 submodule=declarative
-majver=5.7
+majver=5.8
 version=$majver.0
 update_url='https://www.qt.io/download-open-source/'
 update_names="qt-everywhere-opensource-src-$version.tar.gz"
 
 dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-opensource-src-$version.tar.xz" \
-          '0d9e461aa54dba4793253fa2eb501f9b'
+          '4f55b3617abdff14706d02d761d5a0aa'
 header_end
 
 cd "qt$submodule-opensource-src-$version"
diff --git a/satellites/functions/vcs/git.sh b/satellites/functions/vcs/git.sh
index fdd80d7..a01801d 100644
--- a/satellites/functions/vcs/git.sh
+++ b/satellites/functions/vcs/git.sh
@@ -40,7 +40,7 @@ vcs_git() {
     fi
 
     # Update the $version variable accordingly
-    [ "$setver" = true ] && version="$(git rev-list --count "$rev")_$(git rev-parse --short "$rev")" || true
+    [ "$setver" = true ] && version="$(git rev-parse --short "$rev")" || true
 
     cd "$OLDPWD"
 
diff --git a/satellites/palemoon-git.sat b/satellites/palemoon-git.sat
new file mode 100644
index 0000000..f6ee8ed
--- /dev/null
+++ b/satellites/palemoon-git.sat
@@ -0,0 +1,103 @@
+# NOTE: Requires GCC 5.x to build properly (Untested with 6.x, might cause segfaults)
+
+import 'vcs/git'
+
+name=Pale-Moon
+version_autoconf=2.13
+
+define_option 'pulseaudio: Build with support for PulseAudio'
+
+vcs_git "https://github.com/MoonchildProductions/$name"
+( name=autoconf version="$version_autoconf"
+    dlextract "https://ftp.gnu.org/gnu/$name/$name-$version.tar.gz" \
+              '9de56d4a161a723228220b0f425dc711'
+)
+extrafile 'palemoon.desktop'
+header_end
+
+( cd "autoconf-$version_autoconf"
+    ./configure --prefix="$PWD/install" --program-suffix=-$version_autoconf
+    make
+    make install
+)
+
+cd "$name"
+
+cat > .mozconfig << EOF
+# Please see https://www.palemoon.org/redist.shtml for restrictions when using the official branding.
+#ac_add_options --enable-official-branding
+#export MOZILLA_OFFICIAL=1
+
+mk_add_options MOZ_CO_PROJECT=browser
+ac_add_options --enable-application=browser
+
+mk_add_options MOZ_OBJDIR="$PWD/pmbuild/"
+
+ac_add_options --enable-optimize="-O2 -msse2 -mfpmath=sse"
+ac_add_options --with-pthreads
+
+ac_add_options --disable-installer
+ac_add_options --disable-updater
+
+ac_add_options --enable-release
+ac_add_options --enable-devtools
+ac_add_options --enable-jemalloc
+ac_add_options --enable-shared-js
+
+ac_add_options --enable-strip
+
+ac_add_options --x-libraries="/$dir_prefix/$dir_libdir"
+
+# The section before this is kept up to date with https://developer.palemoon.org/Developer_Guide:Build_Instructions/Pale_Moon/Linux#head:Mozconfig_Files (with minor changes)
+# The following section are my additions.
+
+# Use system libraries (./configure --help | grep system)
+ac_add_options --with-system-nspr
+ac_add_options --with-system-libevent
+ac_add_options --with-system-nss
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-webp
+#ac_add_options --with-system-png - The APNG patch is not upstrean
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-ffi
+ac_add_options --with-system-libvpx
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-cairo
+ac_add_options --enable-system-pixman
+ac_add_options --with-system-icu
+
+# Make pulseaudio support optional
+$(option pulseaudio && echo ac_add_options --enable-pulseaudio || echo ac_add_options --disable-pulseaudio)
+EOF
+
+# Build
+PATH="$PWD/../autoconf-$version_autoconf/install/bin:$PATH" \
+make -f client.mk build
+
+# Install
+cd pmbuild
+make package
+
+mkdir -p "$dir_install/$dir_prefix/$dir_libdir/palemoon"
+cp -Ta dist/palemoon "$dir_install/$dir_prefix/$dir_libdir/palemoon"
+mkdir -p "$dir_install/$dir_prefix/$dir_bindir"
+ln -sf "/$dir_prefix/$dir_libdir/palemoon/palemoon" "$dir_install/$dir_prefix/$dir_bindir/palemoon"
+
+cd ../..
+
+# Install icons
+for x in 16 32 48; do
+    mkdir -p "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/${x}x$x/apps"
+    ln -sf "/$dir_prefix/$dir_libdir/palemoon/browser/chrome/icons/default/default$x.png" \
+          "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/${x}x$x/apps/palemoon.png"
+done
+mkdir -p "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/128x128/apps"
+ln -sf "/$dir_prefix/$dir_libdir/palemoon/browser/icons/mozicon128.png" \
+      "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/128x128/apps/palemoon.png"
+
+# Install desktop
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/applications" palemoon.desktop
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/palemoon.sat b/satellites/palemoon.sat
index cfda4a1..170af63 100644
--- a/satellites/palemoon.sat
+++ b/satellites/palemoon.sat
@@ -3,7 +3,6 @@
 name=Pale-Moon
 version=27.2.1
 version_autoconf=2.13
-version_gcc=4.9.4
 update_url="https://github.com/MoonchildProductions/$name/releases"
 update_names="/archive/${version}_Release.tar.gz"
 
diff --git a/satellites/wine.sat b/satellites/wine.sat
index ee9b966..1500b80 100644
--- a/satellites/wine.sat
+++ b/satellites/wine.sat
@@ -1,14 +1,14 @@
 import 'compile/configure'
 
 name=wine
-version=2.5
+version=2.6
 update_url='https://www.winehq.org/'
 update_names="/announce/$version\""
 
 define_option 'wine32=: On x86_64, enable 32bit wine support. Specify the 32bit libdir here'
 
 dlextract "http://dl.winehq.org/$name/source/2.x/$name-$version.tar.xz" \
-          'a01eab8f71fd0a880ad32404386e7bf7'
+          'd1976fb6907550bb30d1f786c0f6f641'
 header_end
 
 cd "$name-$version"
@@ -17,7 +17,7 @@ compile_configure -b build -- $([ "$(uname -m)" = 'x86_64' ] && echo --enable-wi
 
 wine32="$(option =wine32)"
 if [ "$(uname -m)" = 'x86_64' -a "$wine32" ]; then
-    PKG_CONFIG_PATH="$dir_sysroot/$dir_prefix/$wine32/pkgconfig" compile_configure -b build-wine32 -- --with-wine64=../build --libdir="/$dir_prefix/$wine32"
+    PKG_CONFIG_PATH="/$dir_prefix/$wine32/pkgconfig" compile_configure -b build-wine32 -- --with-wine64=../build --libdir="/$dir_prefix/$wine32"
 fi
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/xautolock.sat b/satellites/xautolock.sat
index e12779b..3e76ea4 100644
--- a/satellites/xautolock.sat
+++ b/satellites/xautolock.sat
@@ -1,13 +1,25 @@
+import 'misc/debian'
+
 name=xautolock
-version=2.2
-update_url='https://www.ibiblio.org/pub/Linux/X11/screensavers/'
+orig_version=2.2
+version=$orig_version-5.1
+update_url="http://http.debian.net/debian/pool/main/x/$name/"
 
-dlextract "https://www.ibiblio.org/pub/Linux/X11/screensavers/$name-$version.tgz" \
+dlextract "https://www.ibiblio.org/pub/Linux/X11/screensavers/$name-$orig_version.tgz" \
           '9526347a202694ad235d731d9d3de91f'
+download "http://http.debian.net/debian/pool/main/x/$name/${name}_$version.debian.tar.xz" \
+         'd3d2fefe3345fa380f4e3331b9f13ba3'
 header_end
 
-cd "$name-$version"
+cd "$name-$orig_version"
+extract "${name}_$version.debian.tar.xz"
+misc_debian_patch
+
 xmkmf
-make DESTDIR="$dir_install" install install.man
+make install \
+    DESTDIR="$dir_install" \
+    CCOPTIONS="$CFLAGS" \
+    EXTRA_LDOPTIONS="$LDFLAGS"
+install -Dm644 xautolock.man "$dir_install/$dir_prefix/$dir_mandir/man1/xautolock.1"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab: