diff --git a/src/config/Makefile.version-CML b/src/config/Makefile.version-CML
index 0b6cef8632..7df4aaf004 100644
--- a/src/config/Makefile.version-CML
+++ b/src/config/Makefile.version-CML
@@ -22,4 +22,7 @@ $(VERSFILE).h:
 $(VERSFILE).txt:
 	$(TOP_SRCDIR)/config/mkvers -o $(VERSFILE).txt -t
 
+$(VERSFILE).xml:
+	$(TOP_SRCDIR)/config/mkvers -o $(VERSFILE).xml -x
+
 noversion: install
diff --git a/src/config/Makefile.version-NOCML.in b/src/config/Makefile.version-NOCML.in
index cd2dec1f92..e42cee2345 100644
--- a/src/config/Makefile.version-NOCML.in
+++ b/src/config/Makefile.version-NOCML.in
@@ -7,10 +7,16 @@
 
 PACKAGE=@PACKAGE@
 VERSION=@VERSION@
+VERSFILE=AFS_component_version_number
 
-AFS_component_version_number.o: AFS_component_version_number.c
+$(VERSFILE).o: $(VERSFILE).c
 
-AFS_component_version_number.c: @TOP_OBJDIR@/src/config/Makefile.version
-	echo 'char cml_version_number[]="@(#) OpenAFS ${VERSION} built ' `date +"%Y-%m-%d"` '";' >AFS_component_version_number.c
-	echo 'char* AFSVersion = "${PACKAGE} ${VERSION}"; ' >>AFS_component_version_number.c
+$(VERSFILE).c: @TOP_OBJDIR@/src/config/Makefile.version
+	echo 'char cml_version_number[]="@(#) OpenAFS ${VERSION} built ' `date +"%Y-%m-%d"` '";' >$(VERSFILE).c
+	echo 'char* AFSVersion = "${PACKAGE} ${VERSION}"; ' >>$(VERSFILE).c
 
+$(VERSFILE).xml:
+	echo '<?xml version="1.0" encoding="UTF-8"?>' >$(VERSFILE).xml
+	echo '<revision>' >>$(VERSFILE).xml
+	echo '<revnumber>${VERSION}</revnumber>' >>$(VERSFILE).xml
+	echo '</revision>' >>$(VERSFILE).xml