diff --git a/build_rpm.in b/build_rpm.in
new file mode 100755
index 0000000..7bd3d39
--- /dev/null
+++ b/build_rpm.in
@@ -0,0 +1,18 @@
+#!/bin/sh -x
+
+version=@QF_VERSION@
+temp_dir=/var/tmp
+
+rm -rf ${temp_dir}/quakeforge-${version}
+cp -a @srcdir@ ${temp_dir}/quakeforge-${version}
+dest_dir=$PWD
+cd ${temp_dir}/quakeforge-${version}
+# this is needed to ensure there is a makefile
+./bootstrap
+./configure
+make distclean
+find . -name '.#*' -print | xargs rm
+cd ${temp_dir}
+tar zcf ${dest_dir}/quakeforge-${version}.tar.gz quakeforge-${version}
+cd ${dest_dir}
+rm -rf ${temp_dir}/quakeforge-${version}
diff --git a/configure.in b/configure.in
index ffead38..bdf89d5 100644
--- a/configure.in
+++ b/configure.in
@@ -60,6 +60,14 @@ AC_CHECK_FUNCS(gethostname gethostbyname connect gettimeofday getwd mkdir \
 	ftime _ftime fcntl stat putenv select socket strerror strstr \
 	snprintf _snprintf vsnprintf _vsnprintf)
 
+AC_ARG_ENABLE(experimental,
+[  --enable-experiemental  compile with experimental code. Use at your
+                          own risk]
+)
+if test "x$enable_experimental" = xyes; then
+   AC_DEFINE(_EXPERIMENTAL_)
+fi
+
 NEWSTYLE=no
 AC_ARG_ENABLE(newstyle,
 [  --enable-newstyle       compile with defaults a bit different than those
@@ -719,4 +727,13 @@ AC_SUBST(QF_VERSION)
 
 dnl Output files
 AC_CONFIG_HEADER(common/config.h)
-AC_OUTPUT(qw_client/Makefile qw_server/Makefile uquake/Makefile Makefile quakeforge.spec)
+AC_OUTPUT(
+	qw_client/Makefile
+	qw_server/Makefile
+	uquake/Makefile
+	Makefile
+	quakeforge.spec
+	build_rpm
+	,
+	chmod +x build_rpm
+)