diff --git a/CMakeLists.txt b/CMakeLists.txt
index 906c9de2c..ebf57b8b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ endif()
 project(emulationstation-de)
 
 # Application version, update this when making a new release.
-set(ES_VERSION 2.1.0)
+set(ES_VERSION 2.1.1)
 
 # Set this to ON to show verbose compiler output (e.g. compiler flags, include directories etc.)
 set(CMAKE_VERBOSE_MAKEFILE OFF CACHE BOOL "Show verbose compiler output" FORCE)
diff --git a/es-app/assets/EmulationStation-DE_Info.plist b/es-app/assets/EmulationStation-DE_Info.plist
index 00560c69f..3ef5664d3 100644
--- a/es-app/assets/EmulationStation-DE_Info.plist
+++ b/es-app/assets/EmulationStation-DE_Info.plist
@@ -11,7 +11,7 @@
     <key>CFBundleExecutable</key>
     <string>EmulationStation</string>
     <key>CFBundleGetInfoString</key>
-    <string>EmulationStation Desktop Edition 2.1.0</string>
+    <string>EmulationStation Desktop Edition 2.1.1</string>
     <key>CFBundleIconFile</key>
     <string>EmulationStation-DE.icns</string>
     <key>CFBundleName</key>
@@ -21,9 +21,9 @@
     <key>CFBundleSignature</key>
     <string>ESDE</string>
     <key>CFBundleShortVersionString</key>
-    <string>2.1.0</string>
+    <string>2.1.1</string>
     <key>CFBundleVersion</key>
-    <string>2.1.0</string>
+    <string>2.1.1</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>LSApplicationCategoryType</key>
diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index 25ea606be..16b5495a3 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -2,7 +2,7 @@ EmulationStation Desktop Edition (ES-DE) - Portable installation on Windows
 ---------------------------------------------------------------------------
 
 ES-DE release:
-2.1.0
+2.1.1
 
 Instructions:
 
diff --git a/es-app/assets/emulationstation.6.gz b/es-app/assets/emulationstation.6.gz
index 48348923b..ad37cc20f 100644
Binary files a/es-app/assets/emulationstation.6.gz and b/es-app/assets/emulationstation.6.gz differ
diff --git a/es-app/src/EmulationStation.h b/es-app/src/EmulationStation.h
index d3a349790..67fd627b2 100644
--- a/es-app/src/EmulationStation.h
+++ b/es-app/src/EmulationStation.h
@@ -13,14 +13,14 @@
 // clang-format off
 #define PROGRAM_VERSION_MAJOR        2
 #define PROGRAM_VERSION_MINOR        1
-#define PROGRAM_VERSION_MAINTENANCE  0
-#define PROGRAM_RELEASE_NUMBER       35
+#define PROGRAM_VERSION_MAINTENANCE  1
+#define PROGRAM_RELEASE_NUMBER       36
 // clang-format on
-#define PROGRAM_VERSION_STRING "2.1.0"
+#define PROGRAM_VERSION_STRING "2.1.1"
 
 #define PROGRAM_BUILT_STRING __DATE__ " - " __TIME__
 
-#define RESOURCE_VERSION_STRING "2,1,0\0"
+#define RESOURCE_VERSION_STRING "2,1,1\0"
 #define RESOURCE_VERSION PROGRAM_VERSION_MAJOR, PROGRAM_VERSION_MINOR, PROGRAM_VERSION_MAINTENANCE
 
 #endif // ES_APP_EMULATION_STATION_H