diff --git a/ffmpeg.yaml b/ffmpeg.yaml
index 481509162a4..064913c4cc4 100644
--- a/ffmpeg.yaml
+++ b/ffmpeg.yaml
@@ -1,10 +1,10 @@
 package:
   name: ffmpeg
   version: 6.0
-  epoch: 0
+  epoch: 1
   description: ffmpeg multimedia library
   copyright:
-    - license: LGPL-2.1-or-later
+    - license: GPL-2.0-or-later AND LGPL-2.1-or-later
 
 environment:
   contents:
@@ -14,6 +14,7 @@ environment:
       - ca-certificates-bundle
       - build-base
       - yasm
+      - x264-dev
 
 pipeline:
   - uses: git-checkout
@@ -27,7 +28,9 @@ pipeline:
       ./configure \
         --prefix=/usr \
         --libdir=/usr/lib \
-        --enable-shared
+        --enable-shared \
+        --enable-libx264 \
+        --enable-gpl
 
   - uses: autoconf/make
 
diff --git a/packages.txt b/packages.txt
index 33b15bec2b2..877b49ad86c 100644
--- a/packages.txt
+++ b/packages.txt
@@ -774,6 +774,7 @@ lighttpd
 mdbook
 net-tools
 libvncserver
+x264
 ffmpeg
 libdaemon
 avahi
diff --git a/x264.yaml b/x264.yaml
new file mode 100644
index 00000000000..34165b6e5cf
--- /dev/null
+++ b/x264.yaml
@@ -0,0 +1,64 @@
+# Generated from https://git.alpinelinux.org/aports/plain/community/x264/APKBUILD
+package:
+  name: x264
+  # When bumping this, also bump the URL in the fetch step below. The version scheme is complicated here so we can't use our normal tooling.
+  version: 0_git20191217
+  epoch: 0
+  description: Free library for encoding H264/AVC video streams
+  target-architecture:
+    - all
+  copyright:
+    - paths:
+        - '*'
+      attestation: TODO
+      license: GPL-2.0-or-later
+
+environment:
+  contents:
+    packages:
+      - busybox
+      - ca-certificates-bundle
+      - build-base
+      - automake
+      - autoconf
+      - bash
+      - coreutils
+      - libx11-dev
+      - nasm
+      - perl
+
+pipeline:
+  - uses: fetch
+    with:
+      repo: https://code.videolan.org/videolan/x264.git
+      expected-sha256: b2495c8f2930167d470994b1ce02b0f4bfb24b3317ba36ba7f112e9809264160
+      uri: https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20191217-2245-stable.tar.bz2
+
+  - runs: |
+      ./configure \
+        --host=$CHOST \
+        --prefix=/usr \
+        --enable-shared \
+        --enable-static \
+        --enable-pic \
+        --extra-cflags=-fno-aggressive-loop-optimizations
+
+  - uses: autoconf/make
+
+  - runs: |
+      make DESTDIR="${{targets.destdir}}" \
+        bindir=/usr/bin libdir=/usr/lib includedir=/usr/include install
+
+  - uses: strip
+
+subpackages:
+  - name: x264-dev
+    pipeline:
+      - uses: split/dev
+    dependencies:
+      runtime:
+        - x264
+    description: x264 development files
+
+update:
+  enabled: false