diff --git a/usr.sbin/amd/include/build_version.h b/usr.sbin/amd/include/build_version.h
index 2f80eb2dab6d..09eb1fc91220 100644
--- a/usr.sbin/amd/include/build_version.h
+++ b/usr.sbin/amd/include/build_version.h
@@ -1,6 +1,8 @@
-/* do not edit this file by hand */
-/* auto-generated by update_build_version script */
-/* #define AMU_BUILD_VERSION 1 */
+/* $FreeBSD$ */
 
 #include <sys/param.h>
+/*#define AMU_BUILD_VERSION 1 */
 #define AMU_BUILD_VERSION __FreeBSD_version
+#define USER_NAME "David O'Brien <obrien"
+#define HOST_NAME "FreeBSD.org>"
+#define CONFIG_DATE "4-December-2007 PST"
diff --git a/usr.sbin/amd/include/newvers.sh b/usr.sbin/amd/include/newvers.sh
index 6a35d14b29ba..e192ee91f4d1 100644
--- a/usr.sbin/amd/include/newvers.sh
+++ b/usr.sbin/amd/include/newvers.sh
@@ -32,12 +32,12 @@ fi
 cat << __EOF
 
 /* Define name of host */
-#define HOST_NAME "`hostname`"
+#define BUILD_HOST "`hostname`"
 
 /* Define user name */
-#define USER_NAME "`whoami`"
+#define BUILD_USER "`whoami`"
 
 /* Define configuration date */
-#define CONFIG_DATE "`LC_ALL=C date`"
+#define BUILD_DATE "`LC_ALL=C date`"
 
 __EOF