diff --git a/satellites/libsrtp.sat b/graveyard/unmaintained_satellites/libsrtp.sat
similarity index 100%
rename from satellites/libsrtp.sat
rename to graveyard/unmaintained_satellites/libsrtp.sat
diff --git a/satellites/libwebp.sat b/graveyard/unmaintained_satellites/libwebp.sat
similarity index 83%
rename from satellites/libwebp.sat
rename to graveyard/unmaintained_satellites/libwebp.sat
index ca13d65..790d93c 100644
--- a/satellites/libwebp.sat
+++ b/graveyard/unmaintained_satellites/libwebp.sat
@@ -9,8 +9,6 @@ dlextract "https://storage.googleapis.com/downloads.webmproject.org/releases/web
 header_end
 
 cd "$name-$version"
-compile_configure -- \
-    --disable-static \
-    --enable-libwebpdemux
+compile_configure -- --disable-static --enable-libwebpdemux
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/minizip.sat b/graveyard/unmaintained_satellites/minizip.sat
similarity index 95%
rename from satellites/minizip.sat
rename to graveyard/unmaintained_satellites/minizip.sat
index 1bc10a2..89af459 100644
--- a/satellites/minizip.sat
+++ b/graveyard/unmaintained_satellites/minizip.sat
@@ -9,7 +9,6 @@ dlextract "http://zlib.net/$name-$version.tar.xz" \
 header_end
 
 cd "$name-$version/contrib/minizip"
-rm -f Makefile
 autoreconf -fi
 compile_configure -- --disable-static
 
diff --git a/satellites/opus.sat b/graveyard/unmaintained_satellites/opus.sat
similarity index 100%
rename from satellites/opus.sat
rename to graveyard/unmaintained_satellites/opus.sat
diff --git a/satellites/protobuf.sat b/graveyard/unmaintained_satellites/protobuf.sat
similarity index 100%
rename from satellites/protobuf.sat
rename to graveyard/unmaintained_satellites/protobuf.sat
diff --git a/satellites/python3-jinja2.sat b/graveyard/unmaintained_satellites/python3-jinja2.sat
similarity index 100%
rename from satellites/python3-jinja2.sat
rename to graveyard/unmaintained_satellites/python3-jinja2.sat
diff --git a/satellites/python3-markupsafe.sat b/graveyard/unmaintained_satellites/python3-markupsafe.sat
similarity index 100%
rename from satellites/python3-markupsafe.sat
rename to graveyard/unmaintained_satellites/python3-markupsafe.sat
diff --git a/satellites/python3-peg2.sat b/graveyard/unmaintained_satellites/python3-peg2.sat
similarity index 100%
rename from satellites/python3-peg2.sat
rename to graveyard/unmaintained_satellites/python3-peg2.sat
diff --git a/satellites/python3-pygments.sat b/graveyard/unmaintained_satellites/python3-pygments.sat
similarity index 100%
rename from satellites/python3-pygments.sat
rename to graveyard/unmaintained_satellites/python3-pygments.sat
diff --git a/satellites/python3-sip.sat b/graveyard/unmaintained_satellites/python3-sip.sat
similarity index 100%
rename from satellites/python3-sip.sat
rename to graveyard/unmaintained_satellites/python3-sip.sat
diff --git a/satellites/qt5-declarative.sat b/graveyard/unmaintained_satellites/qt5-declarative.sat
similarity index 100%
rename from satellites/qt5-declarative.sat
rename to graveyard/unmaintained_satellites/qt5-declarative.sat
diff --git a/satellites/qt5-styleplugins-git.sat b/graveyard/unmaintained_satellites/qt5-styleplugins-git.sat
similarity index 100%
rename from satellites/qt5-styleplugins-git.sat
rename to graveyard/unmaintained_satellites/qt5-styleplugins-git.sat
diff --git a/satellites/qt5-webchannel.sat b/graveyard/unmaintained_satellites/qt5-webchannel.sat
similarity index 100%
rename from satellites/qt5-webchannel.sat
rename to graveyard/unmaintained_satellites/qt5-webchannel.sat
diff --git a/graveyard/unmaintained_satellites/qt5-webengine.sat b/graveyard/unmaintained_satellites/qt5-webengine.sat
new file mode 100644
index 0000000..704741f
--- /dev/null
+++ b/graveyard/unmaintained_satellites/qt5-webengine.sat
@@ -0,0 +1,31 @@
+import 'compile/qt'
+
+name=qt5
+submodule=webengine
+majver=5.7
+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" \
+          '937f64886fbcb038d6fa4b44ae80cbeb'
+header_end
+
+cd "qt$submodule-opensource-src-$version"
+
+compile_qt 5 \
+    WEBENGINE_CONFIG+=use_system_icu \
+    WEBENGINE_CONFIG+=use_system_ffmpeg \
+    WEBENGINE_CONFIG+=use_system_minizip \
+    WEBENGINE_CONFIG+=use_system_libwebp \
+    WEBENGINE_CONFIG+=use_system_libxslt \
+    WEBENGINE_CONFIG+=use_system_libevent \
+    WEBENGINE_CONFIG+=use_system_jsoncpp \
+    WEBENGINE_CONFIG+=use_system_opus \
+    WEBENGINE_CONFIG+=use_system_protobuf \
+    WEBENGINE_CONFIG+=use_system_libsrtp \
+    WEBENGINE_CONFIG+=use_system_snappy
+#    WEBENGINE_CONFIG+=use_system_vpx \  It requires a newer version of libvpx. A patch for that from debian just won't apply.
+# Options can be found in tools/qmake/mkspecs/features/configure.prf
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/qutebrowser-git.sat b/graveyard/unmaintained_satellites/qutebrowser-git.sat
new file mode 100644
index 0000000..0b9399a
--- /dev/null
+++ b/graveyard/unmaintained_satellites/qutebrowser-git.sat
@@ -0,0 +1,33 @@
+import 'vcs/git'
+import 'compile/python'
+
+name=qutebrowser
+
+vcs_git "https://github.com/The-Compiler/$name"
+header_end
+
+cd "$name"
+
+# Fix paths
+sed -i -e "s/usr\/share/$(safe_sed "$dir_prefix/$dir_datadir")/" qutebrowser/utils/standarddir.py
+
+compile_python 3
+
+sed -e '/^Name=/s/$/ (Webengine)/' \
+    -e '/^Exec=/s/%u/--backend webengine &/' "$name.desktop" > "$name-webengine.desktop"
+
+# Install manpage
+a2x -f manpage "doc/$name.1.asciidoc"
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_mandir/man1" "doc/$name.1"
+
+# Install desktop and icons
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/applications" "$name.desktop" "$name-webengine.desktop"
+for x in 16 24 32 48 64 96 128 256 512; do
+    install -Dm644 "icons/$name-${x}x$x.png" "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/${x}x$x/apps/$name.png"
+done
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/scalable/apps" "icons/$name.svg"
+
+# Install userscripts
+install -Dm755 -t "$dir_install/$dir_prefix/$dir_datadir/$name/userscripts/" misc/userscripts/*
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/qutebrowser.sat b/graveyard/unmaintained_satellites/qutebrowser.sat
similarity index 100%
rename from satellites/qutebrowser.sat
rename to graveyard/unmaintained_satellites/qutebrowser.sat
diff --git a/graveyard/unmaintained_satellites/imlib2.sat b/satellites/imlib2.sat
similarity index 100%
rename from graveyard/unmaintained_satellites/imlib2.sat
rename to satellites/imlib2.sat
diff --git a/satellites/qt5-webengine.sat b/satellites/qt5-webengine.sat
deleted file mode 100644
index aa3613a..0000000
--- a/satellites/qt5-webengine.sat
+++ /dev/null
@@ -1,19 +0,0 @@
-import 'compile/qt'
-
-name=qt5
-submodule=webengine
-majver=5.7
-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" \
-          '937f64886fbcb038d6fa4b44ae80cbeb'
-header_end
-
-cd "qt$submodule-opensource-src-$version"
-compile_qt 5 \
-    WEBENGINE_CONFIG+='use_system_icu use_system_ffmpeg use_system_minizip use_system_libwebp use_system_libxslt use_system_libevent use_system_jsoncpp use_system_opus use_system_protobuf use_system_libsrtp use_system_snappy'  # use_system_vpx
-# Options can be found in tools/qmake/mkspecs/features/configure.prf
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/virtualbox.sat b/satellites/virtualbox.sat
index b9b5d2d..1d769b6 100644
--- a/satellites/virtualbox.sat
+++ b/satellites/virtualbox.sat
@@ -23,12 +23,13 @@ header_end
 rm -rf trunk/kBuild/bin "$name-$version/kBuild" "$name-$version/tools"
 
 # Build kBuild
-cd trunk
-kBuild/env.sh --full make -f bootstrap.gmk
-mv kBuild "../$name-$version"
+( cd trunk
+    kBuild/env.sh --full make -f bootstrap.gmk
+    mv kBuild "../$name-$version"
+)
 
 # Build VirtualBox
-cd "../$name-$version"
+cd "$name-$version"
 
 # Build with system X libraries
 sed -i -e "/^+\t\/usr\/include/s/usr/$(safe_sed "$dir_prefix")/" ../003-ogl-include-path.patch