diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
index 24ffcb5..c023613 100644
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -34,6 +34,7 @@ jobs:
       matrix:
         version:
           - 2.4.4
+          - 2.5.0-rc1
         variant:
           - debian
           - alpine
diff --git a/Makefile b/Makefile
index befecd3..f849d57 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSIONS =	2.4.4
+VERSIONS =	2.4.4 2.5.0-rc1
 TARBALLS = $(foreach version,$(VERSIONS),icecast-$(version).tar.gz)
 IMAGE = ghcr.io/libretime/icecast
 
diff --git a/README.md b/README.md
index db32d7e..e0708c2 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,8 @@ The following icecast tags are supported:
 
 - `2.4.4-debian`, `2.4.4`, `debian`, `latest`
 - `2.4.4-alpine`, `alpine`
+- `2.5.0-rc1-debian`, `2.5.0-rc1`
+- `2.5.0-rc1-alpine`
 
 The following icecast tags are **not supported** anymore:
 
diff --git a/SHA512SUMS.txt b/SHA512SUMS.txt
index de17ae9..9ffd925 100644
--- a/SHA512SUMS.txt
+++ b/SHA512SUMS.txt
@@ -1,2 +1,3 @@
 e9ffb478cac2570891787455591d881a59185e067bb36f51706a7070cd9d82d80425ec8cf151f5ebb17d1b75654449fc760f8b82a1bb05f020b47ec09e46b4d0  icecast-2.4.4.tar.gz
 5b0c002af61dc0f3ad08b024d823da711b8213f726ffdc659a73fe6d36e1f37ee4b57a280c0dfa72496a66dc33512a7d4e006711f23c7446ea8ef2151d4198b6  icecast-2.5-beta3.tar.gz
+e68730efce8fdf25dceedcc1d3e62cf23e67b88dc6277acd81741de07c4abaf72a5320a8b274925597a7081b5424bd7adbb9f7f753ed11134ac19f1a4797f9fa  icecast-2.5.0-rc1.tar.gz
diff --git a/alpine.dockerfile b/alpine.dockerfile
index f4712a3..353536d 100644
--- a/alpine.dockerfile
+++ b/alpine.dockerfile
@@ -11,7 +11,11 @@ RUN apk --no-cache add \
     libxml2-dev \
     libxslt-dev \
     openssl-dev \
-    speex-dev
+    speex-dev \
+    $(if [ $VERSION = "2.5.0-rc1" ]; then echo \
+    libigloo-dev \
+    librhash-dev \
+    ; fi)
 
 WORKDIR /build
 ADD icecast-$VERSION.tar.gz .
@@ -36,7 +40,11 @@ RUN apk --no-cache add \
     libxml2 \
     libxslt \
     openssl \
-    speex
+    speex \
+    $(if [ $VERSION = "2.5.0-rc1" ]; then echo \
+    libigloo0 \
+    librhash1 \
+    ; fi)
 
 ENV USER=icecast
 
diff --git a/debian.dockerfile b/debian.dockerfile
index 1611e33..4a7d938 100644
--- a/debian.dockerfile
+++ b/debian.dockerfile
@@ -20,7 +20,11 @@ apt-get install -y --no-install-recommends \
     libtheora-dev \
     libvorbis-dev \
     libxml2-dev \
-    libxslt1-dev
+    libxslt1-dev \
+    $(if [ $VERSION = "2.5.0-rc1" ]; then echo \
+    libigloo-dev \
+    librhash-dev \
+    ; fi)
 rm -rf /var/lib/apt/lists/*
 EOF
 
@@ -53,7 +57,11 @@ apt-get install -y --no-install-recommends \
     libtheora0 \
     libvorbis0a \
     libxml2  \
-    libxslt1.1
+    libxslt1.1 \
+    $(if [ $VERSION = "2.5.0-rc1" ]; then echo \
+    libigloo0t64 \
+    librhash1 \
+    ; fi)
 rm -rf /var/lib/apt/lists/*
 EOF
 
diff --git a/icecast-2.5.0-rc1.tar.gz b/icecast-2.5.0-rc1.tar.gz
new file mode 100644
index 0000000..0630c75
--- /dev/null
+++ b/icecast-2.5.0-rc1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:31a1cf68a79319438e7490996e36b41f0d5133208302df578e47adb8566764c1
+size 1601134