diff --git a/make-release b/make-release
new file mode 100755
index 000000000..d1a93433e
--- /dev/null
+++ b/make-release
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ ! -f configure.in ]; then
+	echo "Must be in top directory"
+	exit 1
+fi
+
+if [ $# -ne 1 ]; then
+	echo "make-release version"
+	exit 1
+fi
+
+HV="$1" emacs -batch -q -no-site-file -l ./make-release.el || exit
+
+echo cvs ci -m \"Release $1\" configure.in ChangeLog
diff --git a/make-release.el b/make-release.el
new file mode 100644
index 000000000..00cce9321
--- /dev/null
+++ b/make-release.el
@@ -0,0 +1,13 @@
+(let* ((heimdal-version (getenv "HV"))
+       (version-string (concat "Release" heimdal-version)))
+  (find-file "configure.in")
+  (re-search-forward "AM_INIT_AUTOMAKE(heimdal,\\(.*\\))")
+  (replace-match heimdal-version nil nil nil 1)
+  (save-buffer)
+  ;;(vc-checkin "configure.in" nil version-string)
+  (find-file "ChangeLog")
+  (add-change-log-entry nil nil nil nil)
+  (insert version-string)
+  (save-buffer)
+  ;;(vc-checkin "ChangeLog" nil version-string)
+  (kill-emacs))