diff --git a/Makefile.am b/Makefile.am
index 21321790b..27b44ad16 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS= foreign
 
-SUBDIRS=	debian doc include libs qw nq
+SUBDIRS=	RPM debian doc include libs qw nq
 
-EXTRA_DIST=	ChangeLog RPM/build_rpm.in RPM/quakeforge.spec.in RPM/rpmrc \
+EXTRA_DIST=	ChangeLog \
 		tools/cross/cross-configure.sh tools/cross/cross-make.sh \
 		tools/cross/cross.sh \
 		tools/gas2masm/Makefile tools/gas2masm/gas2masm.c \
diff --git a/RPM/.gitignore b/RPM/.gitignore
index 46f7686c4..9eb294842 100644
--- a/RPM/.gitignore
+++ b/RPM/.gitignore
@@ -1,3 +1,4 @@
+Makefile.in
 build_rpm
 quakeforge.conf
 quakeforge.spec
diff --git a/RPM/Makefile.am b/RPM/Makefile.am
new file mode 100644
index 000000000..c033ad134
--- /dev/null
+++ b/RPM/Makefile.am
@@ -0,0 +1,9 @@
+## Process this file with automake to produce Makefile.in
+AUTOMAKE_OPTIONS=	foreign
+
+EXTRA_DIST=	build_rpm.in quakeforge.conf.in quakeforge.spec.in rpmrc
+
+rpm: build_rpm quakeforge.conf quakeforge.spec rpmrc
+	./build_rpm
+
+CLEANFILES = *.rpm
diff --git a/RPM/build_rpm.in b/RPM/build_rpm.in
index 88351d5c7..56a7d7e57 100644
--- a/RPM/build_rpm.in
+++ b/RPM/build_rpm.in
@@ -8,6 +8,7 @@ top_builddir=..
 
 rm -rf BUILD SPECS RPMS SOURCES SRPMS
 mkdir -p BUILD SPECS RPMS/{noarch,i386,i686} SOURCES SRPMS
+make -C $top_builddir changelog
 make -C $top_builddir dist
 mv $top_builddir/quakeforge-${version}.tar.gz SOURCES
 cat > rpmmacros <<EOF
diff --git a/RPM/quakeforge.spec.in b/RPM/quakeforge.spec.in
index 272d1e41d..561f5a43b 100644
--- a/RPM/quakeforge.spec.in
+++ b/RPM/quakeforge.spec.in
@@ -45,12 +45,20 @@ Summary:	QuakeForge 3D game engine - common files
 Group:		Amusements/Games
 #Requires:
 %description common
+QuakeForge is a source port of Quake and QuakeWorld, the successors to id
+Software's very popular DOOM series. Its primary development goal is to
+remain compatible with the original games released by id Software while
+adding portability and optional extensions to enhance gameplay.
 
 %package server
 Summary:	QuakeForge 3D game engine - Server
 Group:		Amusements/Games
 #Requires:
 %description server
+QuakeForge is a source port of Quake and QuakeWorld, the successors to id
+Software's very popular DOOM series. Its primary development goal is to
+remain compatible with the original games released by id Software while
+adding portability and optional extensions to enhance gameplay.
 
 %if "%{HAVE_3DFX}"=="'yes'"
 %package 3dfx
@@ -66,6 +74,10 @@ Summary:	QuakeForge 3D game engine - fbdev client
 Group:		Amusements/Games
 #Requires:
 %description fbdev
+QuakeForge is a source port of Quake and QuakeWorld, the successors to id
+Software's very popular DOOM series. Its primary development goal is to
+remain compatible with the original games released by id Software while
+adding portability and optional extensions to enhance gameplay.
 %endif
 
 %if "%{HAVE_GLX}"=="'yes'"
@@ -74,6 +86,10 @@ Summary:	QuakeForge 3D game engine - glx client
 Group:		Amusements/Games
 #Requires:
 %description glx
+QuakeForge is a source port of Quake and QuakeWorld, the successors to id
+Software's very popular DOOM series. Its primary development goal is to
+remain compatible with the original games released by id Software while
+adding portability and optional extensions to enhance gameplay.
 %endif
 
 %if "%{HAVE_SDL}"=="'yes'"
@@ -82,6 +98,10 @@ Summary:	QuakeForge 3D game engine - SDL client
 Group:		Amusements/Games
 #Requires:
 %description sdl
+QuakeForge is a source port of Quake and QuakeWorld, the successors to id
+Software's very popular DOOM series. Its primary development goal is to
+remain compatible with the original games released by id Software while
+adding portability and optional extensions to enhance gameplay.
 %endif
 
 %if "%{HAVE_SGL}"=="'yes'"
@@ -90,6 +110,10 @@ Summary:	QuakeForge 3D game engine - SDL-GL client
 Group:		Amusements/Games
 #Requires:
 %description sgl
+QuakeForge is a source port of Quake and QuakeWorld, the successors to id
+Software's very popular DOOM series. Its primary development goal is to
+remain compatible with the original games released by id Software while
+adding portability and optional extensions to enhance gameplay.
 %endif
 
 %if "%{HAVE_SVGA}"=="'yes'"
@@ -98,6 +122,10 @@ Summary:	QuakeForge 3D game engine - SVGAlib client
 Group:		Amusements/Games
 #Requires:
 %description svga
+QuakeForge is a source port of Quake and QuakeWorld, the successors to id
+Software's very popular DOOM series. Its primary development goal is to
+remain compatible with the original games released by id Software while
+adding portability and optional extensions to enhance gameplay.
 %endif
 
 %if "%{HAVE_X11}"=="'yes'"
@@ -106,6 +134,10 @@ Summary:	QuakeForge 3D game engine - X11 client
 Group:		Amusements/Games
 #Requires:
 %description x11
+QuakeForge is a source port of Quake and QuakeWorld, the successors to id
+Software's very popular DOOM series. Its primary development goal is to
+remain compatible with the original games released by id Software while
+adding portability and optional extensions to enhance gameplay.
 %endif
 
 %if "%{HAVE_ALSA}"=="'yes'"
@@ -114,6 +146,11 @@ Summary:	ALSA 0.9 sound plugin for QuakeForge
 Group:		Amusements/Games
 #Requires:
 %description snd-alsa
+QuakeForge is a source port of Quake and QuakeWorld, the successors to id
+Software's very popular DOOM series. Its primary development goal is to
+remain compatible with the original games released by id Software while
+adding portability and optional extensions to enhance gameplay.
+
 The ALSA 0.9 plugin for QuakeForge provides digital audio output for QuakeForge
 targets that contain clients.
 %endif
@@ -124,6 +161,11 @@ Summary:	OSS sound plugin for QuakeForge
 Group:		Amusements/Games
 #Requires:
 %description snd-oss
+QuakeForge is a source port of Quake and QuakeWorld, the successors to id
+Software's very popular DOOM series. Its primary development goal is to
+remain compatible with the original games released by id Software while
+adding portability and optional extensions to enhance gameplay.
+
 The OSS plugin for QuakeForge provides digital audio output (using OSS/Linux,
 OSS/Free, or kernel sound) for QuakeForge targets that contain clients.
 
@@ -138,6 +180,11 @@ Summary:	SDL sound plugin for QuakeForge
 Group:		Amusements/Games
 #Requires:
 %description snd-sdl
+QuakeForge is a source port of Quake and QuakeWorld, the successors to id
+Software's very popular DOOM series. Its primary development goal is to
+remain compatible with the original games released by id Software while
+adding portability and optional extensions to enhance gameplay.
+
 The SDL plugin for QuakeForge provides digital audio output for QuakeForge
 targets that contain clients.
 %endif
@@ -148,6 +195,10 @@ Summary:	QuakeForge 3D game engine - OpenGL renderer libraries
 Group:	Amusements/Games
 #Requires:
 %description libs-gl
+QuakeForge is a source port of Quake and QuakeWorld, the successors to id
+Software's very popular DOOM series. Its primary development goal is to
+remain compatible with the original games released by id Software while
+adding portability and optional extensions to enhance gameplay.
 %endif
 
 %if "%{BUILD_SW}"=="'yes'"
@@ -156,6 +207,10 @@ Summary:	QuakeForge 3D game engine - Software renderer libraries
 Group:	Amusements/Games
 #Requires:
 %description libs-sw
+QuakeForge is a source port of Quake and QuakeWorld, the successors to id
+Software's very popular DOOM series. Its primary development goal is to
+remain compatible with the original games released by id Software while
+adding portability and optional extensions to enhance gameplay.
 %endif
 
 %package devel
@@ -163,6 +218,10 @@ Summary:	QuakeForge 3D game engine - headers and devel libs
 Group:	Amusements/Games
 Requires:	quakeforge-common
 %description devel
+QuakeForge is a source port of Quake and QuakeWorld, the successors to id
+Software's very popular DOOM series. Its primary development goal is to
+remain compatible with the original games released by id Software while
+adding portability and optional extensions to enhance gameplay.
 
 
 
@@ -173,7 +232,11 @@ Requires:	quakeforge-common
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix}
-make
+if test -f /proc/cpuinfo; then
+	make -j`grep processor /proc/cpuinfo | wc -l`
+else
+	make
+fi
 
 %install
 if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
diff --git a/configure.in b/configure.in
index b78dcb1db..a367ef75e 100644
--- a/configure.in
+++ b/configure.in
@@ -1478,6 +1478,7 @@ AC_OUTPUT(
 
 	debian/Makefile
 
+	RPM/Makefile
 	RPM/build_rpm
 	RPM/quakeforge.conf
 	RPM/quakeforge.spec,