diff --git a/blacklist b/blacklist
index 4a097e9..a403417 100644
--- a/blacklist
+++ b/blacklist
@@ -14,7 +14,7 @@ xfce
 y
 
 # a
-aaa_solibs
+#aaa_elflibs
 #glibc-solibs
 #openssl-solibs
 #elilo
@@ -34,6 +34,7 @@ slackpkg
 
 # d
 gcc-go
+gcc-java
 
 # l
 alsa-plugins
@@ -64,7 +65,7 @@ xv
 
 # --- Rationales:
 #
-# aaa_solibs: A shitty "fix" for a non-existing problem. Includes old libraries which might be vulnerable. Old software should just be rebuilt, and I can resolve library dependencies for myself, tyvm.
+# aaa_elflibs: A shitty "fix" for a non-existing problem. Includes old libraries which might be vulnerable. Old software should just be rebuilt, and I can resolve library dependencies for myself, tyvm.
 # MPlayer, sox: Need a rebuild to work without PulseAudio, and I don't use them anyway.
 # seamonkey, seamonkey-solibs: No particular reason, I just don't use it, and it's big.
 # ttf-indic-fonts: Winetricks doesn't like it.
@@ -78,9 +79,32 @@ xv
 # elvis: vim
 # rxvt: rxvt-unicode
 # gcc-go: go (They actually conflict)
+# gcc-java: icedtea (Needs gcc-java to bootstrap)
 #
 # -- Optional:
 # elilo, lilo, syslinux, grub: Uncomment the ones not used.
 # k, d: Only needed if you need to compile programs.
 # openssl-solibs: Useless if n/openssl is installed.
 # glibc-solibs: Useless if l/glibc is installed.
+
+
+# Here follows a list of packages I modify/add to the base installation, which would need to be blacklisted after install.
+
+# Custom packages
+#[0-9]+rocket
+#.*-astro
+#convert32-.*
+
+# Modified packages
+#gcc
+#gcc-g++
+#gcc-gfortran
+#gcc-gnat
+#gcc-objc
+#wpa_supplicant
+
+# Manually updated packages
+#hunspell
+#mozilla-nss
+#vim
+#vim-gvim
diff --git a/etc/astronaut.conf b/etc/astronaut.conf
index 212a31a..2bf3837 100644
--- a/etc/astronaut.conf
+++ b/etc/astronaut.conf
@@ -20,6 +20,7 @@ package_options() {
         python3-setuptools) echo '!easy_install-symlink' ;;
         texlive) echo '!system-harfbuzz' ;;
         wine) echo 'wine32=lib' ;;
+        ffmpeg) echo 'openssl,libvpx,libvorbis,libass' ;;
     esac
 }