diff --git a/satellites/ffmpeg.sat b/satellites/ffmpeg.sat
index d797c7c..82ff5b4 100644
--- a/satellites/ffmpeg.sat
+++ b/satellites/ffmpeg.sat
@@ -1,15 +1,24 @@
 name=ffmpeg
-version=3.4.1
+version=4.0
 
 dlextract "http://ffmpeg.org/releases/$name-$version.tar.bz2" \
-          'bbf3fcded80c33968c91bf323a744286'
+          'bf6d0540acb6270fa52fdc53010a1206'
 _
 
 cd "$name-$version"
 
-# ffmpeg uses it's own configure script with arguably differing options to the
-#   regular GNU autotools configure scripts.
-# Not using compile_configure due to that.
+optional=""
+for opt in gnutls libvpx libvorbis libass libx264; do
+    lib="$opt"
+    case "$opt" in
+        libvpx) lib=vpx ;;
+        libvorbis) lib=vorbis ;;
+        libx264) lib=x264 ;;
+    esac
+
+    pkg-config --exists "$lib" && optional+=" --enable-$opt"
+done
+
 ./configure --disable-static --enable-shared \
     --prefix="/$dir_prefix" \
     --bindir="/$dir_prefix/$dir_bin" \
@@ -20,11 +29,7 @@ cd "$name-$version"
     --mandir="/$dir_prefix/$dir_man" \
     --enable-gpl \
     --enable-version3 \
-    $(pkg-config --exists gnutls && echo --enable-gnutls) \
-    $(pkg-config --exists vpx && echo --enable-libvpx) \
-    $(pkg-config --exists vorbis && echo --enable-libvorbis) \
-    $(pkg-config --exists libass && echo --enable-libass)
-
+    $optional
 make
 make DESTDIR="$dir_install" install
 
diff --git a/satellites/libx264.sat b/satellites/libx264.sat
new file mode 100644
index 0000000..a0a5926
--- /dev/null
+++ b/satellites/libx264.sat
@@ -0,0 +1,13 @@
+import 'compile/configure'
+
+name=x264
+version=20180421-2245
+
+dlextract "http://ftp.videolan.org/pub/videolan/$name/snapshots/$name-snapshot-$version-stable.tar.bz2" \
+          'c0b295d1c8950eb98eadb5193c7ea97a'
+_
+
+cd "$name-snapshot-$version-stable"
+compile_configure -- --enable-shared
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/markdown.sat b/satellites/markdown.sat
index 7782ae4..f305344 100644
--- a/satellites/markdown.sat
+++ b/satellites/markdown.sat
@@ -6,8 +6,7 @@ download "https://daringfireball.net/projects/downloads/${name}_$version.zip" \
 _
 
 # TODO: Support other formats, such as zip, with the extract command.
-extract "${name}_$version.zip" \
-        '' \
+extract "${name}_$version.zip" '' \
         'unzip -qd {dst} {src}'
 install -D "${name}_$version/$name.pl" "$dir_install/$dir_prefix/$dir_bin/markdown"
 
diff --git a/satellites/qt5-base.sat b/satellites/qt5-base.sat
index 0a4c667..310f546 100644
--- a/satellites/qt5-base.sat
+++ b/satellites/qt5-base.sat
@@ -18,7 +18,7 @@ sed -i -e "s/^\(QMAKE_LFLAGS_RELEASE.*\)/\1 $(safe_sed "$LDFLAGS")/" mkspecs/com
 optional=""
 for opt in libpng libjpeg freetype harfbuzz xcb xkbcommon-x11; do
     lib="$opt"
-    [ "$lib" = 'freetype' ] && lib='freetype2'
+    [ "$lib" = freetype ] && lib=freetype2
 
     pkg-config --exists "$lib" && optional+=" -system-$opt" || optional+=" -no-$opt"
 done