diff --git a/src/Makefile b/src/Makefile
index 207369a..94139a5 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -182,10 +182,11 @@ VERSION_MINOR	= 0
 VERSION_PATCH	= 0
 EXTRAVERSION	= +
 MM_VERSION	= $(VERSION_MAJOR).$(VERSION_MINOR)
+GITVERSION	= $(shell git describe --tags --long 2>/dev/null)
+ifeq ($(GITVERSION),)
 VERSION		= $(MM_VERSION).$(VERSION_PATCH)$(EXTRAVERSION)
-GITVERSION := $(shell git describe --always --abbrev=1 --match "" 2>/dev/null)
-ifneq ($(GITVERSION),)
-VERSION		+= ($(GITVERSION))
+else
+VERSION		= $(GITVERSION)
 endif
 version :
 	@$(ECHO) "$(VERSION)"
diff --git a/src/usr/autoboot.c b/src/usr/autoboot.c
index b2d288e..b60a702 100644
--- a/src/usr/autoboot.c
+++ b/src/usr/autoboot.c
@@ -482,9 +482,10 @@ void ipxe ( struct net_device *netdev ) {
 	 * do so.
 	 *
 	 */
-	printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD "iPXE %s"
+	printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD "iPXE"
 		 NORMAL " -- Open Source Network Boot Firmware -- "
 		 CYAN "http://ipxe.org" NORMAL "\n"
+		 "Version %s compiled on " __DATE__ ", " __TIME__ "\n"
 		 "Features:", product_version );
 	for_each_table_entry ( feature, FEATURES )
 		printf ( " %s", feature->name );