diff --git a/Makefile b/Makefile
index 4442a96993..a8be30a5f7 100644
--- a/Makefile
+++ b/Makefile
@@ -48,6 +48,7 @@ CORE_NEXT:=	${CORE_NEXT}.1
 .elif ${_CORE_NEXT:[2]} == 10 # business
 CORE_NEXT!=	expr ${_CORE_NEXT:[1]} + 1
 CORE_NEXT:=	${CORE_NEXT}.4
+CORE_SPACER=	no
 .elif ${_CORE_NEXT:[2]} == 1 # community
 CORE_NEXT=	${_CORE_NEXT:[1]}
 CORE_NEXT:=	${CORE_NEXT}.7
@@ -98,6 +99,11 @@ CORE_STABLE?=	stable/${CORE_ABI}
 
 _CORE_SERIES=	${CORE_VERSION:S/./ /g}
 CORE_SERIES?=	${_CORE_SERIES:[1]}.${_CORE_SERIES:[2]}
+.if empty(CORE_SPACER)
+CORE_SERIES_FW=	${CORE_SERIES:S/$/ /1}
+.else
+CORE_SERIES_FW=	${CORE_SERIES}
+.endif
 
 .if "${CORE_REVISION}" != "" && "${CORE_REVISION}" != "0"
 CORE_PKGVERSION=	${CORE_VERSION}_${CORE_REVISION}
diff --git a/Mk/defaults.mk b/Mk/defaults.mk
index e5da74a0e9..f68ccbb397 100644
--- a/Mk/defaults.mk
+++ b/Mk/defaults.mk
@@ -84,6 +84,7 @@ REPLACEMENTS=	CORE_ABI \
 		CORE_PYTHON_DOT \
 		CORE_REPOSITORY \
 		CORE_SERIES \
+		CORE_SERIES_FW \
 		CORE_SYSLOGNG \
 		CORE_VERSION \
 		CORE_WWW
diff --git a/src/opnsense/service/templates/OPNsense/Auth/motd.in b/src/opnsense/service/templates/OPNsense/Auth/motd.in
index 47496c4bea..80cd1cdd2e 100644
--- a/src/opnsense/service/templates/OPNsense/Auth/motd.in
+++ b/src/opnsense/service/templates/OPNsense/Auth/motd.in
@@ -1,5 +1,5 @@
 ----------------------------------------------
-|      Hello, this is OPNsense %%CORE_SERIES%%          |         @@@@@@@@@@@@@@@
+|      Hello, this is OPNsense %%CORE_SERIES_FW%%         |         @@@@@@@@@@@@@@@
 |                                            |        @@@@         @@@@
 | Website:	https://opnsense.org/        |         @@@\\\   ///@@@
 | Handbook:	https://docs.opnsense.org/   |       ))))))))   ((((((((