4 files changed, 6 insertions, 5 deletions
diff --git a/doc/application-api-guide/Doxyfile b/doc/application-api-guide/Doxyfile
index 8a04b6632..a1777932e 100644
--- a/doc/application-api-guide/Doxyfile
+++ b/doc/application-api-guide/Doxyfile
@@ -1,7 +1,7 @@
 @INCLUDE = $(SRCDIR)/doc/Doxyfile_common
 
 PROJECT_NAME = "API Reference Manual"
-PROJECT_NUMBER = $(VERSION)
+PROJECT_NUMBER = $(ODP_VERSION_API)
 PROJECT_LOGO = $(SRCDIR)/doc/images/ODP-Logo-HQ.svg
 INPUT = $(SRCDIR)/doc/application-api-guide \
 	include \
diff --git a/doc/helper-guide/Doxyfile b/doc/helper-guide/Doxyfile
index 74eb6b94f..cf370e129 100644
--- a/doc/helper-guide/Doxyfile
+++ b/doc/helper-guide/Doxyfile
@@ -1,5 +1,5 @@
-PROJECT_NAME = "Helper Reference Manual for $(WITH_PLATFORM)"
-PROJECT_NUMBER = $(VERSION)
+PROJECT_NAME = "Helper Reference Manual"
+PROJECT_NUMBER = $(ODPH_VERSION)
 PROJECT_LOGO = $(SRCDIR)/doc/images/ODP-Logo-HQ.svg
 QUIET = YES
 OUTPUT_DIRECTORY = $(DOCDIR)
diff --git a/doc/platform-api-guide/Doxyfile b/doc/platform-api-guide/Doxyfile
index 7b4170ea3..e581e7b62 100644
--- a/doc/platform-api-guide/Doxyfile
+++ b/doc/platform-api-guide/Doxyfile
@@ -1,7 +1,7 @@
 @INCLUDE = $(SRCDIR)/doc/Doxyfile_common
 
 PROJECT_NAME = "API Reference Manual for $(WITH_PLATFORM)"
-PROJECT_NUMBER = $(VERSION)
+PROJECT_NUMBER = $(ODP_VERSION_API)
 PROJECT_LOGO = $(SRCDIR)/doc/images/ODP-Logo-HQ.svg
 INPUT = $(SRCDIR)/doc/application-api-guide \
 	$(SRCDIR)/doc/platform-api-guide \
diff --git a/m4/ax_prog_doxygen.m4 b/m4/ax_prog_doxygen.m4
index 2758a5c23..7ffcbe4c9 100644
--- a/m4/ax_prog_doxygen.m4
+++ b/m4/ax_prog_doxygen.m4
@@ -268,7 +268,8 @@ m4_define([DX_loop], m4_dquote(m4_if(m4_eval(3 < m4_count($@)), 1,
 # Environment variables used inside doxygen.cfg:
 DX_ENV_APPEND(SRCDIR, $srcdir)
 DX_ENV_APPEND(PROJECT, $DX_PROJECT)
-DX_ENV_APPEND(VERSION, $PACKAGE_VERSION)
+DX_ENV_APPEND(ODP_VERSION_API, $ODP_VERSION_API)
+DX_ENV_APPEND(ODPH_VERSION, $ODPH_VERSION)
 
 # Doxygen itself:
 DX_ARG_ABLE(doc, [generate any doxygen documentation],