2 files changed, 15 insertions, 0 deletions

diff --git a/release/generate-release.sh b/release/generate-release.sh
index cdba0267346f..6a95e36a1f8a 100755
--- a/release/generate-release.sh
+++ b/release/generate-release.sh
@@ -14,6 +14,7 @@
 #  SVNROOT:    SVN URL to FreeBSD source repository (by default, 
 #   svn://svn.freebsd.org/base)
 #  MAKE_FLAGS: optional flags to pass to make (e.g. -j)
+#  RELSTRING:  optional base name for media images (e.g. FreeBSD-9.0-RC2-amd64)
 # 
 #  Note: Since this requires a chroot, release cross-builds will not work!
 #
@@ -65,3 +66,12 @@ chroot $2 make -C /usr/src $MAKE_FLAGS buildworld buildkernel
 chroot $2 make -C /usr/src/release release
 chroot $2 make -C /usr/src/release install DESTDIR=/R
 
+: ${RELSTRING=`chroot $2 uname -s`-`chroot $2 uname -r`-`chroot $2 uname -p`}
+
+cd $2/R
+for i in release.iso bootonly.iso memstick; do
+	mv $i $RELSTRING-$i
+done
+sha256 $RELSTRING-* > CHECKSUM.SHA256
+md5 $RELSTRING-* > CHECKSUM.MD5
+
diff --git a/share/man/man7/release.7 b/share/man/man7/release.7
index f2ca0c8ac40d..f527c2442d94 100644
--- a/share/man/man7/release.7
+++ b/share/man/man7/release.7
@@ -149,6 +149,11 @@ when invoked by the script.
 .It Ev SVNROOT
 The location of the FreeBSD SVN source repository. Defaults to
 .Pa svn://svn.freebsd.org/base .
+.It Ev RELSTRING
+Optional base name for generated media images (e.g. FreeBSD-9.0-RC2-amd64).
+Defaults to the output of 
+.Ic `uname -s`-`uname -r`-`uname -p`
+within the chroot.
 .El
 .Sh MAKEFILE TARGETS
 The release makefile