diff --git a/CMakeLists.txt b/CMakeLists.txt
index 94c9698..273e039 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,6 +13,7 @@ project (planetblupi)
 set (PB_VERSION_MAJOR 1)
 set (PB_VERSION_MINOR 9)
 set (PB_VERSION_PATCH 0)
+set (PB_VERSION_EXTRA "-rc1")
 set (PB_PRODUCT_NAME "Planet Blupi")
 set (PB_PACKAGE_NAME "planetblupi")
 set (PB_DESCRIPTION "Planet Blupi - A delerious spell-binding game")
@@ -225,9 +226,7 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
   set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.all")
   # set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README-user.md")
   set (CPACK_PACKAGE_FILE_NAME ${PB_PACKAGE_NAME})
-  set (CPACK_PACKAGE_VERSION_MAJOR ${PB_VERSION_MAJOR})
-  set (CPACK_PACKAGE_VERSION_MINOR ${PB_VERSION_MINOR})
-  set (CPACK_PACKAGE_VERSION_PATCH ${PB_VERSION_PATCH})
+  set (CPACK_PACKAGE_VERSION "${PB_VERSION_MAJOR}.${PB_VERSION_MINOR}.${PB_VERSION_PATCH}${PB_VERSION_EXTRA}")
   set (CPACK_PACKAGE_INSTALL_DIRECTORY ${PB_PRODUCT_NAME})
   set (CPACK_PACKAGE_EXECUTABLES "planetblupi;Planet Blupi")
 
@@ -236,7 +235,7 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
     set (CMAKE_PACKAGED_OUTPUT_PREFIX ${CMAKE_INSTALL_PREFIX})
     APPIMAGE_PACKAGE (planetblupi ${PB_PACKAGE_NAME} ${PB_PRODUCT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/resources/linux" "${CMAKE_BINARY_DIR}/share" "" "" "blupi")
   elseif (MINGW)
-    set (CPACK_PACKAGE_FILE_NAME "${PB_PACKAGE_NAME}-${PB_VERSION_MAJOR}.${PB_VERSION_MINOR}.${PB_VERSION_PATCH}")
+    set (CPACK_PACKAGE_FILE_NAME "${PB_PACKAGE_NAME}-${PB_VERSION_MAJOR}.${PB_VERSION_MINOR}.${PB_VERSION_PATCH}${PB_VERSION_EXTRA}")
     set (CPACK_GENERATOR "NSIS64")
     set (CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\resources\\\\nsis\\\\installer.bmp")
     set (CPACK_NSIS_COMPRESSOR "/SOLID lzma")
@@ -253,12 +252,12 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
     set (CPACK_BUNDLE_NAME ${PB_PRODUCT_NAME})
     set (CPACK_BUNDLE_PLIST "${CMAKE_BINARY_DIR}/Info.plist")
     set (CPACK_BUNDLE_STARTUP_COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/resources/darwin/Planet Blupi")
-    set (CPACK_PACKAGE_FILE_NAME "planetblupi-${PB_VERSION_MAJOR}.${PB_VERSION_MINOR}.${PB_VERSION_PATCH}")
+    set (CPACK_PACKAGE_FILE_NAME "planetblupi-${PB_VERSION_MAJOR}.${PB_VERSION_MINOR}.${PB_VERSION_PATCH}${PB_VERSION_EXTRA}")
 
     set (CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/resources/darwin/background.tiff")
     set (CPACK_DMG_DS_STORE_SETUP_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/resources/darwin/dmgsetup.scpt")
 
-    set (BUNDLE_VERSION "${PB_VERSION_MAJOR}.${PB_VERSION_MINOR}.${PB_VERSION_PATCH}")
+    set (BUNDLE_VERSION "${PB_VERSION_MAJOR}.${PB_VERSION_MINOR}.${PB_VERSION_PATCH}${PB_VERSION_EXTRA}")
     set (BUNDLE_IDENTIFIER "org.blupi.planet")
     set (BUNDLE_ICON_REF "Planet Blupi")
 
diff --git a/resources/win32/planetblupi.rc.in b/resources/win32/planetblupi.rc.in
index da1c28c..f9f4cf9 100644
--- a/resources/win32/planetblupi.rc.in
+++ b/resources/win32/planetblupi.rc.in
@@ -10,12 +10,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName", "Epsitec SA"
       VALUE "FileDescription", "@PB_DESCRIPTION@"
-      VALUE "FileVersion", "@PB_VERSION_MAJOR@.@PB_VERSION_MINOR@.@PB_VERSION_PATCH@"
+      VALUE "FileVersion", "@PB_VERSION_MAJOR@.@PB_VERSION_MINOR@.@PB_VERSION_PATCH@@PB_VERSION_EXTRA@"
       VALUE "InternalName", "@PB_PACKAGE_NAME@"
       VALUE "LegalCopyright", "Epsitec SA, Daniel Roux and Mathieu Schroeter"
       VALUE "OriginalFilename", "@PB_PACKAGE_NAME@.exe"
       VALUE "ProductName", "@PB_PRODUCT_NAME@"
-      VALUE "ProductVersion", "@PB_VERSION_MAJOR@.@PB_VERSION_MINOR@.@PB_VERSION_PATCH@"
+      VALUE "ProductVersion", "@PB_VERSION_MAJOR@.@PB_VERSION_MINOR@.@PB_VERSION_PATCH@@PB_VERSION_EXTRA@"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/src/blupi.cxx b/src/blupi.cxx
index 1bbc9db..b1d9ef2 100644
--- a/src/blupi.cxx
+++ b/src/blupi.cxx
@@ -402,6 +402,9 @@ HandleEvent (const SDL_Event & event)
         [](const std::string & s) -> unsigned int { return std::stoi (s); });
 
       if (
+        (!!PB_VERSION_EXTRA[0] &&
+        PB_VERSION_INT (version[0], version[1], version[2]) >=
+        PLANETBLUPI_VERSION_INT) ||
         PB_VERSION_INT (version[0], version[1], version[2]) >
         PLANETBLUPI_VERSION_INT)
         g_pEvent->SetUpdateVersion (jsonData["version"]);
diff --git a/src/config.h.in b/src/config.h.in
index e46f2e6..e1630ef 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -21,3 +21,4 @@
 #define PB_VERSION_MAJOR @PB_VERSION_MAJOR@
 #define PB_VERSION_MINOR @PB_VERSION_MINOR@
 #define PB_VERSION_PATCH @PB_VERSION_PATCH@
+#define PB_VERSION_EXTRA "@PB_VERSION_EXTRA@"
diff --git a/src/event.cxx b/src/event.cxx
index ec0c90d..94b5b2a 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -1958,11 +1958,11 @@ CEvent::DrawButtons ()
 
   if (m_phase == EV_PHASE_INIT)
   {
-    pos.x = 570;
-    pos.y = 465;
     snprintf (
-      res, sizeof (res), "%s %u.%u.%u", gettext ("Version"), PB_VERSION_MAJOR,
-      PB_VERSION_MINOR, PB_VERSION_PATCH);
+      res, sizeof (res), "%s %u.%u.%u%s", gettext ("Version"),
+      PB_VERSION_MAJOR, PB_VERSION_MINOR, PB_VERSION_PATCH, PB_VERSION_EXTRA);
+    pos.x = LXIMAGE - GetTextWidth (res, FONTLITTLE) - 4;
+    pos.y = 465;
     DrawText (m_pPixmap, pos, res, FONTLITTLE);
 
     if (!this->m_updateVersion.empty () && this->m_updateBlinking++ % 80 < 40)