diff --git a/src/Version.h b/src/Version.h
index e1f8f8d8e..a587e7f77 100644
--- a/src/Version.h
+++ b/src/Version.h
@@ -54,29 +54,35 @@
    #define VERSION_FILEVERSION_LONG  L"Notepad3 v." VERSION_FILEVERSION
 #endif
 
+
+
 // Compiler specific
 #if defined(_MSC_VER)
-    #if _MSC_VER >= 1911
-        #if  (_MSC_FULL_VER >= 191125506)
+    #if (_MSC_VER >= 1911)
+        #if((_MSC_FULL_VER >= 191125542) && (_MSC_FULL_VER <= 191125547))
+           #define VER_CPL     "Microsoft Visual C++ 2017  Version 15.4"
+        #elif((_MSC_FULL_VER >= 191125506) && (_MSC_FULL_VER <= 191125508))
            #define VER_CPL     "Microsoft Visual C++ 2017  Version 15.3"
         #else
            #define VER_CPL     "Microsoft Visual C++ 2017"
         #endif
-    #elif _MSC_VER >= 1910
-        #if  (_MSC_FULL_VER >= 191025017)
-            #define VER_CPL    "Microsoft Visual C++ 2017"
+    #elif (_MSC_VER >= 1910)
+        #if ((_MSC_FULL_VER >= 191025017) && (_MSC_FULL_VER <= 191025019))
+           #define VER_CPL     "Microsoft Visual C++ 2017  Version 15.2"
         #else
             #define VER_CPL    "Microsoft Visual C++ 2017  RC"
         #endif
-    #elif _MSC_VER == 1900
-        #if (_MSC_FULL_VER >= 190024213)
+    #elif (_MSC_VER == 1900)
+        #if (_MSC_FULL_VER == 190024210) || (_MSC_FULL_VER == 190024215)
             #define VER_CPL    "Microsoft Visual C++ 2015  Update 3"
-        #elif (_MSC_FULL_VER >= 190023918)
+        #elif (_MSC_FULL_VER == 190023918)
             #define VER_CPL    "Microsoft Visual C++ 2015  Update 2"
-        #elif (_MSC_FULL_VER >= 190023506)
+        #elif (_MSC_FULL_VER == 190023506)
+            #define VER_CPL    "Microsoft Visual C++ 2015  Update 1"
+        #elif (_MSC_FULL_VER == 190023506)
             #define VER_CPL    "Microsoft Visual C++ 2015  Update 1"
         #else
-            #define VER_CPL    "Microsoft Visual C++ 2015"
+            #define VER_CPL    "Microsoft Visual C++  (version unknown)"
         #endif
     #else
         #define VER_CPL        "Microsoft Visual C++  (version unknown)"