diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 6383675..5d91e76 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -59,14 +59,18 @@ jobs:
             version: 10
           - os: debian
             version: 11
-          - os: fedora
-            version: 34
           - os: fedora
             version: 35
           ## FFMPEG5 causes issues
           ## See https://github.com/performous/composer/issues/45
-          #- os: fedora
-          #  version: 36
+          - os: fedora
+            version: 36
+          - os: fedora
+            version: 37
+          - os: fedora
+            version: 38
+          - os: fedora
+            version: 39
     steps:
       - name: Container name
         run: |
diff --git a/README.md b/README.md
index 9613cd6..d458ed5 100644
--- a/README.md
+++ b/README.md
@@ -23,8 +23,12 @@ Latest builds
 - [Linux - Ubuntu 22.04](https://nightly.link/performous/composer/workflows/build_and_release/master/Composer-latest-ubuntu_22.04.deb.zip)
 - [Linux - Debian 10](https://nightly.link/performous/composer/workflows/build_and_release/master/Composer-latest-debian_10.deb.zip)
 - [Linux - Debian 11](https://nightly.link/performous/composer/workflows/build_and_release/master/Composer-latest-debian_11.deb.zip)
-- [Linux - Fedora 34](https://nightly.link/performous/composer/workflows/build_and_release/master/Composer-latest-fedora_34.rpm.zip)
+- [Linux - Debian 12](https://nightly.link/performous/composer/workflows/build_and_release/master/Composer-latest-debian_12.deb.zip)
 - [Linux - Fedora 35](https://nightly.link/performous/composer/workflows/build_and_release/master/Composer-latest-fedora_35.rpm.zip)
+- [Linux - Fedora 36](https://nightly.link/performous/composer/workflows/build_and_release/master/Composer-latest-fedora_36.rpm.zip)
+- [Linux - Fedora 37](https://nightly.link/performous/composer/workflows/build_and_release/master/Composer-latest-fedora_37.rpm.zip)
+- [Linux - Fedora 38](https://nightly.link/performous/composer/workflows/build_and_release/master/Composer-latest-fedora_38.rpm.zip)
+- [Linux - Fedora 39](https://nightly.link/performous/composer/workflows/build_and_release/master/Composer-latest-fedora_39.rpm.zip)
 - [Linux - AppImage](https://nightly.link/performous/composer/workflows/build_and_release/master/Composer-latest.AppImage.zip)
 
 Build & Install
diff --git a/src/ffmpeg.cc b/src/ffmpeg.cc
index 32fc6b2..022aedc 100644
--- a/src/ffmpeg.cc
+++ b/src/ffmpeg.cc
@@ -68,7 +68,9 @@ double FFmpeg::duration() const {
 
 void FFmpeg::open() {
 	QMutexLocker l(&s_avcodec_mutex);
+#if (LIBAVFORMAT_VERSION_INT) <= (AV_VERSION_INT(59, 0, 100))
 	av_register_all();
+#endif
 	av_log_set_level(AV_LOG_ERROR);
 	if (avformat_open_input(&pFormatCtx, m_filename.c_str(), NULL, NULL)) throw std::runtime_error("Cannot open input file");
 	if (avformat_find_stream_info(pFormatCtx, NULL) < 0) throw std::runtime_error("Cannot find stream information");
@@ -82,6 +84,9 @@ void FFmpeg::open() {
 	}
 	if (audioStream == -1) throw std::runtime_error("No audio stream found");
 	AVCodecContext* cc = pFormatCtx->streams[audioStream]->codec;
+#if (LIBAVFORMAT_VERSION_INT) >= (AV_VERSION_INT(59, 0, 100))
+	const
+#endif
 	pAudioCodec = avcodec_find_decoder(cc->codec_id);
 	audioQueue.setRateChannels(m_rate, 2);
 	if (!pAudioCodec) throw std::runtime_error("Cannot find audio codec");