diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f1599870ad351246c069e2e011cd9ae6908f1cb..b20657e6bbe8f8ae12d4a5ed0e515ea0aa569612 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Added
+
+* Added ffmpeg and ImageMagick to Docker image to support specialized thumbnail types.
+
 ### Fixed
 
 * Handle guest accounts properly. Previously they were still declined, though by coincidence.
diff --git a/Dockerfile b/Dockerfile
index 3cad9bb6cd34aa07ba83d10799a74b8ef7fbf290..624892e4f7c23cf54f73f85ca4798555239b2b56 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,9 @@ COPY --from=builder /opt/bin/media_repo /opt/bin/import_synapse /opt/bin/gdpr_ex
 RUN apk add --no-cache \
         su-exec \
         ca-certificates \
-        dos2unix
+        dos2unix \
+        imagemagick \
+        ffmpeg
 
 COPY ./config.sample.yaml /etc/media-repo.yaml.sample
 COPY ./docker/run.sh /usr/local/bin/