diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c047e4..5599d9f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,6 +136,10 @@ target_include_directories(
 
 if(BUILD_SHARED_LIBS)
 	if(WIN32)
+		if(PROJECT_VERSION_PATCH STREQUAL "")
+			set(PROJECT_VERSION_PATCH 0)
+		endif()
+
 		configure_file(
 			"${CMAKE_CURRENT_SOURCE_DIR}/sources/Z80.rc.in"
 			"${PROJECT_BINARY_DIR}/Z80.rc"
diff --git a/sources/Z80.rc.in b/sources/Z80.rc.in
index 64dc063..b40bd61 100644
--- a/sources/Z80.rc.in
+++ b/sources/Z80.rc.in
@@ -1,6 +1,6 @@
 1 VERSIONINFO
-	FILEVERSION    @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,0,0
-	PRODUCTVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,0,0
+	FILEVERSION    @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,0
+	PRODUCTVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,0
 	FILEFLAGSMASK  0x3FL
 #ifdef NDEBUG
 	FILEFLAGS 0x0L
@@ -17,12 +17,12 @@ BEGIN
 		BEGIN
 			VALUE "CompanyName",      "Manuel Sainz de Baranda y Goñi"
 			VALUE "FileDescription",  "@PROJECT_DESCRIPTION@"
-			VALUE "FileVersion",      "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@"
+			VALUE "FileVersion",      "@PROJECT_VERSION@"
 			VALUE "InternalName",     "@PROJECT_NAME@"
 			VALUE "LegalCopyright",   "Copyright © 1999-2022 Manuel Sainz de Baranda y Goñi"
 			VALUE "OriginalFilename", "@PROJECT_NAME@.dll"
 			VALUE "ProductName",      "@PROJECT_NAME@"
-			VALUE "ProductVersion",   "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@"
+			VALUE "ProductVersion",   "@PROJECT_VERSION@"
 		END
 	END
 	BLOCK "VarFileInfo"