diff --git a/English.lproj/Credits.html b/English.lproj/Credits.html
index 56d865e..916511a 100644
--- a/English.lproj/Credits.html
+++ b/English.lproj/Credits.html
@@ -32,5 +32,12 @@
       Contact details for the author are <a
       href="http://homepages.kcbbs.gen.nz/tonyg/contact.html">here</a>.
     </p>
+
+    <h4>Build information</h4>
+    <ul>
+      <li>Build stamp @BUILD_STAMP@</li>
+      <li>@GUI_VERSION@</li>
+      <li>@SERVER_VERSION@</li>
+    </ul>
   </body>
 </html>
diff --git a/Makefile b/Makefile
index 68c82c7..6e9278b 100644
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,31 @@ APP_NAME="Hop Server"
 RELEASE_RESOURCES=build/Release/$(APP_NAME).app/Contents/Resources
 DEBUG_RESOURCES=build/Debug/$(APP_NAME).app/Contents/Resources
 
+BUILD_STAMP:=$(shell date +%Y%m%d-%H%M%S)
+GUI_VERSION:=Hop OSX GUI revision git-$(shell git branch -v --abbrev=8 | grep '^\*' | awk '{print $$3}')
+SERVER_VERSION:=Server revision git-$(shell cd $(SERVER_PATH); git branch -v --abbrev=8 | grep '^\*' | awk '{print $$3}')
+
 release: $(SERVER_PATH)/$(SERVER_BINARY)
 	xcodebuild -configuration Release
 	cp $(SERVER_PATH)/$(SERVER_BINARY) $(RELEASE_RESOURCES)/.
 	sh ./fixup_shlibs.sh $(RELEASE_RESOURCES) $(SERVER_BINARY)
 	cp -rp $(SERVER_PATH)/$(SERVER_WEB) $(RELEASE_RESOURCES)/.
+	sed \
+		-e 's:@BUILD_STAMP@:$(BUILD_STAMP):g' \
+		-e 's:@GUI_VERSION@:$(GUI_VERSION):g' \
+		-e 's:@SERVER_VERSION@:$(SERVER_VERSION):g' \
+		$(RELEASE_RESOURCES)/English.lproj/Credits.html \
+		> $(RELEASE_RESOURCES)/English.lproj/Credits.html.tmp
+	mv \
+		$(RELEASE_RESOURCES)/English.lproj/Credits.html.tmp \
+		$(RELEASE_RESOURCES)/English.lproj/Credits.html
+
+# /usr/libexec/PlistBuddy \
+# 	-c "Set CFBundleShortVersionString $(GUI_VERSION)" \
+# 	$(RELEASE_RESOURCES)/../Info.plist
+# /usr/libexec/PlistBuddy \
+# 	-c "Set CFBundleVersion $(SERVER_VERSION)" \
+# 	$(RELEASE_RESOURCES)/../Info.plist
 
 debug: $(SERVER_PATH)/$(SERVER_BINARY)
 	xcodebuild -configuration Debug