diff --git a/Commander-Genius-v2.4.6.tar.bz2 b/Commander-Genius-v2.4.6.tar.bz2
deleted file mode 100644
index 6bc3789..0000000
--- a/Commander-Genius-v2.4.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:735bf8aecc1ff23b0757bc3cf769e95cdefc80d262d6b5106068a89faae88ea2
-size 55332074
diff --git a/Commander-Genius-v2.5.4.tar.bz2 b/Commander-Genius-v2.5.4.tar.bz2
new file mode 100644
index 0000000..ce0562a
--- /dev/null
+++ b/Commander-Genius-v2.5.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:374b88b1c3ecbbbe2660dd13706add2043f5e34a02faeacee3893f737b4812f0
+size 55364736
diff --git a/commandergenius-set-gskit-linker-language.patch b/commandergenius-set-gskit-linker-language.patch
new file mode 100644
index 0000000..e38e674
--- /dev/null
+++ b/commandergenius-set-gskit-linker-language.patch
@@ -0,0 +1,12 @@
+diff --git a/GsKit/CMakeLists.txt b/GsKit/CMakeLists.txt
+index 9a5013a..0b8ebf1 100644
+--- a/GsKit/CMakeLists.txt
++++ b/GsKit/CMakeLists.txt
+@@ -190,5 +190,7 @@ IF(USE_OPENGL)
+     target_link_libraries(${PROJECT_NAME} ${OPENGL_LIBRARIES})
+ ENDIF(USE_OPENGL)
+ 
++SET_TARGET_PROPERTIES(GsKit PROPERTIES LINKER_LANGUAGE CXX)
++
+ endif()
+ 
diff --git a/commandergenius.changes b/commandergenius.changes
index 81468af..59d8f9e 100644
--- a/commandergenius.changes
+++ b/commandergenius.changes
@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Tue Aug 18 20:38:53 UTC 2020 - Martin Hauke <mardnh@gmx.de>
+
+- Update to release 2.5.4
+  * Level swap when Hardmode in Episode 1 works once again
+
+-------------------------------------------------------------------
+Sun Aug 16 13:55:11 UTC 2020 - Martin Hauke <mardnh@gmx.de>
+
+- Update to release 2.5.3
+  * Secret Ending In Keen 5 is unlockable
+  * Crash fixes with older save game files
+
+-------------------------------------------------------------------
+Thu Aug 13 18:57:49 UTC 2020 - Martin Hauke <mardnh@gmx.de>
+
+- Update to release 2.5.2
+  * Improved blinking sprites for home-made creations
+  * Keen dreams improvements with level signs
+  * Now you can remove gameplay and menu bindings
+  * Collision detection improvements
+  * Splitting up the control settings a bit better
+  * Since you can unbind Super Run option got removed.
+
+-------------------------------------------------------------------
+Sun Aug  2 18:01:33 UTC 2020 - Martin Hauke <mardnh@gmx.de>
+
+- Update to release 2.5.1
+  * Ceilick Ai improvements
+  * Small bug fix with sprite export in Galaxy Keen.
+- Add patch:
+  * commandergenius-set-gskit-linker-language.patch
+
 -------------------------------------------------------------------
 Sun Jul 26 19:31:44 UTC 2020 - Martin Hauke <mardnh@gmx.de>
 
diff --git a/commandergenius.spec b/commandergenius.spec
index 95acc68..d80aa4b 100644
--- a/commandergenius.spec
+++ b/commandergenius.spec
@@ -17,7 +17,7 @@
 
 
 Name:           commandergenius
-Version:        2.4.6
+Version:        2.5.4
 Release:        0
 Summary:        An open clone of the Commander Keen engines
 License:        GPL-2.0-only
@@ -25,6 +25,7 @@ Group:          Amusements/Games/Action/Arcade
 URL:            http://clonekeenplus.sf.net/
 #Git-Clone:     https://gitlab.com/Dringgstein/Commander-Genius.git
 Source:         https://gitlab.com/Dringgstein/Commander-Genius/-/archive/v%version/Commander-Genius-v%version.tar.bz2
+Patch0:         commandergenius-set-gskit-linker-language.patch
 BuildRequires:  boost-devel
 BuildRequires:  cmake >= 2.8
 BuildRequires:  fdupes
@@ -47,9 +48,11 @@ It has 4-player cooperative mode and six difficulty modes.
 
 %prep
 %setup -q -n Commander-Genius-v%version
+%patch0 -p1
 
 %build
 %cmake \
+  -DCMAKE_SHARED_LINKER_FLAGS="" \
   -DCMAKE_INSTALL_PREFIX="%_prefix" \
   -DAPPDIR="%_bindir"
 %make_jobs