diff --git a/satellites/ffmpeg.sat b/satellites/ffmpeg.sat
index da97f23..500e19e 100644
--- a/satellites/ffmpeg.sat
+++ b/satellites/ffmpeg.sat
@@ -7,11 +7,6 @@ update_url='https://ffmpeg.org/download.html'
 # NOTE: Not everything has been tested.
 optional_libraries='avisynth frei0r libcdio librubberband libvidstab libx264 libx265 libxavs libxvid gmp libopencore_amrnb libopencore_amrwb libvo_amrwbenc libsmbclient chromaprint crystalhd gcrypt gnutls jni ladspa libass libbluray libbs2b libcaca libcelt libdc1394 libflite libfontconfig libfreetype libfribidi libgme libgsm libiec61883 libilbc libkvazaar libmodplug libmp3lame libnut libopencv libopenh264 libopenjpeg libopenmpt libopus libpulse librtmp libschroedinger libshine libsmbclient libsnappy libsoxr libspeex libssh libtesseract libtheora libtwolame libv4l2 libvorbis libvpx libwavpack libwebp libzimg libzmq libzvbi mediacodec netcdf openal opencl opengl videotoolbox'
 for opt in $optional_libraries; do
-    # Rename some options
-    case "$opt" in
-        libpulse) opt=pulseaudio ;;
-    esac
-
     define_option "!$opt: Enable support for $opt"
 done
 
@@ -23,14 +18,7 @@ cd "$name-$version"
 
 optional=""
 for opt in $optional_libraries; do
-    flag="$opt"
-
-    # Rename some options
-    case "$opt" in
-        libpulse) opt=pulseaudio ;;
-    esac
-
-    option $opt && optional="$optional --enable-$flag"
+    option $opt && optional="$optional --enable-$opt"
 done
 
 # ffmpeg uses it's own configure script with arguably differing options to the
diff --git a/satellites/i3status.sat b/satellites/i3status.sat
index 8e27b93..2d94799 100644
--- a/satellites/i3status.sat
+++ b/satellites/i3status.sat
@@ -2,8 +2,6 @@ name=i3status
 version=2.11
 update_url="https://i3wm.org/$name/"
 
-define_option 'pulseaudio: Build with support for PulseAudio'
-
 dlextract "https://i3wm.org/$name/$name-$version.tar.bz2" \
           'a5c0a364d917ffc57c42af3f6936e700'
 extrafile "$name-$version-disable-pulseaudio.patch"
@@ -11,7 +9,7 @@ _
 
 cd "$name-$version"
 
-option !pulseaudio patch -p0 -i "../$name-$version-disable-pulseaudio.patch"
+pkg-config --exists libpulse || patch -p0 -i "../$name-$version-disable-pulseaudio.patch"
 
 # Fix paths
 sed -i -e "/install -m/s/bin/$(safe_sed "$dir_bin")/" \
diff --git a/satellites/palemoon.sat b/satellites/palemoon.sat
index 4123ec0..02af521 100644
--- a/satellites/palemoon.sat
+++ b/satellites/palemoon.sat
@@ -1,38 +1,36 @@
 # The Pale Moon team recommends building with GCC 4.9. While other versions like 5.x are known to work, they're unsupported.
 
 name=Pale-Moon
-version=27.5.0
+version=27.5.1
 version_gcc=4.9.4
 version_autoconf=2.13
 update_url="https://github.com/MoonchildProductions/$name/releases"
 update_names="/archive/${version}_Release.tar.gz"
 
-define_option 'pulseaudio: Build with support for PulseAudio'
-
 dlextract "https://github.com/MoonchildProductions/$name/archive/${version}_Release/$name-${version}_Release.tar.gz" \
-          'f786d177566a88d650a003afdf41e281'
+          '5c18e5f60fcc94580571f0db5c00a8a5'
 extrafile 'palemoon.desktop'
 
-( name=gcc version="$version_gcc"
-    dlextract "https://ftp.gnu.org/gnu/$name/$name-$version/$name-$version.tar.bz2" \
-              '87c24a4090c1577ba817ec6882602491'
-)
+#( name=gcc version="$version_gcc"
+#    dlextract "https://ftp.gnu.org/gnu/$name/$name-$version/$name-$version.tar.bz2" \
+#              '87c24a4090c1577ba817ec6882602491'
+#)
 ( name=autoconf version="$version_autoconf"
     dlextract "https://ftp.gnu.org/gnu/$name/$name-$version.tar.gz" \
               '9de56d4a161a723228220b0f425dc711'
 )
 _
 
-( cd "gcc-$version_gcc"
-    sed -i -e 's/\.\/fixinc\.sh/-c true/' gcc/Makefile.in
-    mkdir build; cd build
-    ../configure \
-        --prefix="$PWD/../install" \
-        --disable-bootstrap \
-        --enable-languages=c++
-    make
-    make install
-)
+#( cd "gcc-$version_gcc"
+#    sed -i -e 's/\.\/fixinc\.sh/-c true/' gcc/Makefile.in
+#    mkdir build; cd build
+#    ../configure \
+#        --prefix="$PWD/../install" \
+#        --disable-bootstrap \
+#        --enable-languages=c++
+#    make
+#    make install
+#)
 
 ( cd "autoconf-$version_autoconf"
     ./configure --prefix="$PWD/install" --program-suffix=-$version_autoconf
@@ -88,7 +86,7 @@ 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)
+$(pkg-config --exists libpulse || echo ac_add_options --disable-pulseaudio)
 EOF
 
 # This program is about as picky about compiler flags as it is about the compiler version.
diff --git a/satellites/virtualbox.sat b/satellites/virtualbox.sat
index f085f5b..f5fed0d 100644
--- a/satellites/virtualbox.sat
+++ b/satellites/virtualbox.sat
@@ -7,9 +7,7 @@ name=VirtualBox
 deb_name=virtualbox
 version=5.1.24
 
-define_option 'pulseaudio: Add pulseaudio support'
 define_option 'pam: Use PAM for authentication'
-define_option 'docs: Build documentation (requires texlive)'
 
 misc_debian_download -r contrib -n "$deb_name" -O dfsg-2 \
                      '4784ea878d4e1b8f5bc9ce47c42c2831'
@@ -89,8 +87,8 @@ EOF
     --disable-kmods \
     --with-makeself=/bin/true \
     --disable-java \
-    $(option pulseaudio || echo --disable-pulse) \
-    $(option docs || echo --disable-docs)
+    --disable-docs \
+    $(pkg-config --exists libpulse || echo --disable-pulse)
 source ./env.sh
 kmk LOCALCFG=./LocalConfig.kmk