diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 cmake_minimum_required(VERSION 3.5)
 project(bitcoin-abc
-	VERSION 0.20.3.0
+	VERSION 0.20.3
 	# TODO add description and homepage when CMake > 3.12 is enforced.
 	# DESCRIPTION "Bitcoin ABC is a full node implementation of the Bitcoin Cash protocol."
 	# HOMEPAGE "https://www.bitcoinabc.org"
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,6 @@
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 20)
 define(_CLIENT_VERSION_REVISION, 3)
-define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2019)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
@@ -1205,7 +1204,6 @@
 AC_SUBST(CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MAJOR)
 AC_SUBST(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR)
 AC_SUBST(CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION)
-AC_SUBST(CLIENT_VERSION_BUILD, _CLIENT_VERSION_BUILD)
 AC_SUBST(CLIENT_VERSION_IS_RELEASE, _CLIENT_VERSION_IS_RELEASE)
 AC_SUBST(COPYRIGHT_YEAR, _COPYRIGHT_YEAR)
 AC_SUBST(COPYRIGHT_HOLDERS, "_COPYRIGHT_HOLDERS")
diff --git a/share/setup.nsi.in b/share/setup.nsi.in
--- a/share/setup.nsi.in
+++ b/share/setup.nsi.in
@@ -58,7 +58,7 @@
 XPStyle on
 BrandingText " "
 ShowInstDetails show
-VIProductVersion ${VERSION}.@CLIENT_VERSION_BUILD@
+VIProductVersion ${VERSION}.0
 VIAddVersionKey ProductName "@PACKAGE_NAME@"
 VIAddVersionKey ProductVersion "${VERSION}"
 VIAddVersionKey CompanyName "${COMPANY}"
diff --git a/src/bitcoin-cli-res.rc b/src/bitcoin-cli-res.rc
--- a/src/bitcoin-cli-res.rc
+++ b/src/bitcoin-cli-res.rc
@@ -1,8 +1,8 @@
 #include <windows.h>             // needed for VERSIONINFO
 #include <clientversion.h>       // holds the needed client version information
 
-#define VER_PRODUCTVERSION     CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_REVISION,CLIENT_VERSION_BUILD
-#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD)
+#define VER_PRODUCTVERSION     CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_REVISION
+#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION)
 #define VER_FILEVERSION        VER_PRODUCTVERSION
 #define VER_FILEVERSION_STR    VER_PRODUCTVERSION_STR
 
diff --git a/src/bitcoin-tx-res.rc b/src/bitcoin-tx-res.rc
--- a/src/bitcoin-tx-res.rc
+++ b/src/bitcoin-tx-res.rc
@@ -1,8 +1,8 @@
 #include <windows.h>             // needed for VERSIONINFO
 #include <clientversion.h>       // holds the needed client version information
 
-#define VER_PRODUCTVERSION     CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_REVISION,CLIENT_VERSION_BUILD
-#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD)
+#define VER_PRODUCTVERSION     CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_REVISION
+#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION)
 #define VER_FILEVERSION        VER_PRODUCTVERSION
 #define VER_FILEVERSION_STR    VER_PRODUCTVERSION_STR
 
diff --git a/src/bitcoind-res.rc b/src/bitcoind-res.rc
--- a/src/bitcoind-res.rc
+++ b/src/bitcoind-res.rc
@@ -1,8 +1,8 @@
 #include <windows.h>             // needed for VERSIONINFO
 #include <clientversion.h>       // holds the needed client version information
 
-#define VER_PRODUCTVERSION     CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_REVISION,CLIENT_VERSION_BUILD
-#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD)
+#define VER_PRODUCTVERSION     CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_REVISION
+#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION)
 #define VER_FILEVERSION        VER_PRODUCTVERSION
 #define VER_FILEVERSION_STR    VER_PRODUCTVERSION_STR
 
diff --git a/src/clientversion.h b/src/clientversion.h
--- a/src/clientversion.h
+++ b/src/clientversion.h
@@ -13,8 +13,8 @@
 
 // Check that required client information is defined
 #if !defined(CLIENT_VERSION_MAJOR) || !defined(CLIENT_VERSION_MINOR) ||        \
-    !defined(CLIENT_VERSION_REVISION) || !defined(CLIENT_VERSION_BUILD) ||     \
-    !defined(CLIENT_VERSION_IS_RELEASE) || !defined(COPYRIGHT_YEAR)
+    !defined(CLIENT_VERSION_REVISION) || !defined(COPYRIGHT_YEAR) ||           \
+    !defined(CLIENT_VERSION_IS_RELEASE)
 #error Client version information missing: version is not defined by bitcoin-config.h nor defined any other way
 #endif
 
@@ -41,9 +41,9 @@
 #include <string>
 #include <vector>
 
-static const int CLIENT_VERSION =
-    1000000 * CLIENT_VERSION_MAJOR + 10000 * CLIENT_VERSION_MINOR +
-    100 * CLIENT_VERSION_REVISION + 1 * CLIENT_VERSION_BUILD;
+static const int CLIENT_VERSION = 1000000 * CLIENT_VERSION_MAJOR +
+                                  10000 * CLIENT_VERSION_MINOR +
+                                  100 * CLIENT_VERSION_REVISION;
 
 extern const std::string CLIENT_NAME;
 extern const std::string CLIENT_BUILD;
diff --git a/src/clientversion.cpp b/src/clientversion.cpp
--- a/src/clientversion.cpp
+++ b/src/clientversion.cpp
@@ -49,33 +49,32 @@
 #define GIT_COMMIT_DATE "$Format:%cD$"
 #endif
 
-#define BUILD_DESC_WITH_SUFFIX(maj, min, rev, build, suffix)                   \
+#define BUILD_DESC_WITH_SUFFIX(maj, min, rev, suffix)                          \
     "v" DO_STRINGIZE(maj) "." DO_STRINGIZE(min) "." DO_STRINGIZE(              \
-        rev) "." DO_STRINGIZE(build) "-" DO_STRINGIZE(suffix)
+        rev) "-" DO_STRINGIZE(suffix)
 
-#define BUILD_DESC_FROM_COMMIT(maj, min, rev, build, commit)                   \
+#define BUILD_DESC_FROM_COMMIT(maj, min, rev, commit)                          \
     "v" DO_STRINGIZE(maj) "." DO_STRINGIZE(min) "." DO_STRINGIZE(              \
-        rev) "." DO_STRINGIZE(build) "-g" commit
+        rev) "-g" commit
 
-#define BUILD_DESC_FROM_UNKNOWN(maj, min, rev, build)                          \
-    "v" DO_STRINGIZE(maj) "." DO_STRINGIZE(min) "." DO_STRINGIZE(              \
-        rev) "." DO_STRINGIZE(build) "-unk"
+#define BUILD_DESC_FROM_UNKNOWN(maj, min, rev)                                 \
+    "v" DO_STRINGIZE(maj) "." DO_STRINGIZE(min) "." DO_STRINGIZE(rev) "-unk"
 
 #ifndef BUILD_DESC
 #ifdef BUILD_SUFFIX
 #define BUILD_DESC                                                             \
     BUILD_DESC_WITH_SUFFIX(CLIENT_VERSION_MAJOR, CLIENT_VERSION_MINOR,         \
-                           CLIENT_VERSION_REVISION, CLIENT_VERSION_BUILD,      \
-                           BUILD_SUFFIX)
+                           CLIENT_VERSION_REVISION, BUILD_SUFFIX)
+
 #elif defined(GIT_COMMIT_ID)
 #define BUILD_DESC                                                             \
     BUILD_DESC_FROM_COMMIT(CLIENT_VERSION_MAJOR, CLIENT_VERSION_MINOR,         \
-                           CLIENT_VERSION_REVISION, CLIENT_VERSION_BUILD,      \
-                           GIT_COMMIT_ID)
+                           CLIENT_VERSION_REVISION, GIT_COMMIT_ID)
+
 #else
 #define BUILD_DESC                                                             \
     BUILD_DESC_FROM_UNKNOWN(CLIENT_VERSION_MAJOR, CLIENT_VERSION_MINOR,        \
-                            CLIENT_VERSION_REVISION, CLIENT_VERSION_BUILD)
+                            CLIENT_VERSION_REVISION)
 #endif
 #endif
 
diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt
--- a/src/config/CMakeLists.txt
+++ b/src/config/CMakeLists.txt
@@ -14,7 +14,6 @@
 set(CLIENT_VERSION_MAJOR ${bitcoin-abc_VERSION_MAJOR} CACHE STRING "Major version number")
 set(CLIENT_VERSION_MINOR ${bitcoin-abc_VERSION_MINOR} CACHE STRING "Minor version number")
 set(CLIENT_VERSION_REVISION ${bitcoin-abc_VERSION_PATCH} CACHE STRING "Revision version number")
-set(CLIENT_VERSION_BUILD ${bitcoin-abc_VERSION_TWEAK} CACHE STRING "Build version number")
 
 option(CLIENT_VERSION_IS_RELEASE "Build a release version" OFF)
 
diff --git a/src/config/version.h.cmake.in b/src/config/version.h.cmake.in
--- a/src/config/version.h.cmake.in
+++ b/src/config/version.h.cmake.in
@@ -8,7 +8,6 @@
 #define CLIENT_VERSION_MAJOR ${CLIENT_VERSION_MAJOR}
 #define CLIENT_VERSION_MINOR ${CLIENT_VERSION_MINOR}
 #define CLIENT_VERSION_REVISION ${CLIENT_VERSION_REVISION}
-#define CLIENT_VERSION_BUILD ${CLIENT_VERSION_BUILD}
 #cmakedefine01 CLIENT_VERSION_IS_RELEASE
 
 #endif // BITCOIN_CONFIG_VERSION_H
diff --git a/src/config/version.h.in b/src/config/version.h.in
--- a/src/config/version.h.in
+++ b/src/config/version.h.in
@@ -8,7 +8,6 @@
 #define CLIENT_VERSION_MAJOR @CLIENT_VERSION_MAJOR@
 #define CLIENT_VERSION_MINOR @CLIENT_VERSION_MINOR@
 #define CLIENT_VERSION_REVISION @CLIENT_VERSION_REVISION@
-#define CLIENT_VERSION_BUILD @CLIENT_VERSION_BUILD@
 #define CLIENT_VERSION_IS_RELEASE @CLIENT_VERSION_IS_RELEASE@
 
 #endif // BITCOIN_CONFIG_VERSION_H
diff --git a/src/qt/res/bitcoin-qt-res.rc b/src/qt/res/bitcoin-qt-res.rc
--- a/src/qt/res/bitcoin-qt-res.rc
+++ b/src/qt/res/bitcoin-qt-res.rc
@@ -4,8 +4,8 @@
 #include <windows.h>             // needed for VERSIONINFO
 #include <clientversion.h>       // holds the needed client version information
 
-#define VER_PRODUCTVERSION     CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_REVISION,CLIENT_VERSION_BUILD
-#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD)
+#define VER_PRODUCTVERSION     CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_REVISION
+#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION)
 #define VER_FILEVERSION        VER_PRODUCTVERSION
 #define VER_FILEVERSION_STR    VER_PRODUCTVERSION_STR