diff --git a/dist/msi/CMakeLists.txt b/dist/msi/CMakeLists.txt
index 76d84acd3..0badcc49b 100644
--- a/dist/msi/CMakeLists.txt
+++ b/dist/msi/CMakeLists.txt
@@ -12,6 +12,11 @@ set(VERSION "${TR_USER_AGENT_PREFIX}")
 set(VERSION_MSI "${TR_VERSION_MAJOR}.${TR_VERSION_MINOR}.0")
 set(VERSION_FULL "${TR_USER_AGENT_PREFIX} (${TR_VCS_REVISION})")
 
+set(MSI_FILENAME_VERSION "${VERSION}")
+if(TR_NIGHTLY_RELEASE)
+    set(MSI_FILENAME_VERSION "${MSI_FILENAME_VERSION}-r${TR_VCS_REVISION}")
+endif()
+
 if(NOT TR_THIRD_PARTY_DIR)
     set(TR_THIRD_PARTY_DIR "$<TARGET_FILE_DIR:OpenSSL::SSL>/..")
 endif()
@@ -89,7 +94,7 @@ wix_candle(${PROJECT_NAME}_OBJS
 
 wix_light(${PROJECT_NAME}_OUTPUT
     NAME
-        transmission-${VERSION}-r${TR_VCS_REVISION}-${ARCH}
+        transmission-${MSI_FILENAME_VERSION}-${ARCH}
     OBJECTS
         ${${PROJECT_NAME}_OBJS}
     EXTENSIONS