diff --git a/src/help.cpp b/src/help.cpp
index cfefdbee..726b1f18 100644
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -53,7 +53,6 @@ void show_head(void)
         return;
     head_done = 1;
 
-#define V(x)    (strcmp(UPX_VERSION_STRING, UPX_VERSION_STRING4) ? UPX_VERSION_STRING : UPX_VERSION_STRING x)
     fg = con_fg(f,FG_GREEN);
     con_fprintf(f,
                 "                       Ultimate Packer for eXecutables\n"
@@ -67,10 +66,6 @@ void show_head(void)
 #if defined(UPX_VERSION_GITREV)
                 gitrev,
                 (sizeof(gitrev)-1 > 6 && gitrev[sizeof(gitrev)-2] == '+') ? '+' : ' ',
-#elif (ACC_OS_DOS16 || ACC_OS_DOS32)
-                V("d"),
-#elif (ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
-                V("w"),
 #else
                 UPX_VERSION_STRING,
 #endif
diff --git a/src/main.cpp b/src/main.cpp
index 904846f1..75681cbd 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1328,7 +1328,6 @@ __acc_static_noinline void upx_sanity_check(void)
 
     COMPILE_TIME_ASSERT(sizeof(UPX_VERSION_STRING4) == 4 + 1)
     assert(strlen(UPX_VERSION_STRING4) == 4);
-    assert(memcmp(UPX_VERSION_STRING4, UPX_VERSION_STRING, 4) == 0);
     COMPILE_TIME_ASSERT(sizeof(UPX_VERSION_YEAR) == 4 + 1)
     assert(strlen(UPX_VERSION_YEAR) == 4);
     assert(memcmp(UPX_VERSION_DATE_ISO, UPX_VERSION_YEAR, 4) == 0);
diff --git a/src/version.h b/src/version.h
index aecf8e72..5baabbc0 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,5 +1,5 @@
 #define UPX_VERSION_HEX         0x040000        /* 04.00.00 */
-#define UPX_VERSION_STRING      "4.00"
+#define UPX_VERSION_STRING      "4.0.0"
 #define UPX_VERSION_STRING4     "4.00"
 #define UPX_VERSION_DATE        "Jan 24th 2020"
 #define UPX_VERSION_DATE_ISO    "2020-01-24"