diff --git a/configure.in b/configure.in
index cb2198d..3cb58ad 100644
--- a/configure.in
+++ b/configure.in
@@ -9,7 +9,7 @@ dnl This is the only place where the package version appears
 AM_INIT_AUTOMAKE(nuq, 0.2.99alpha0)
 
 dnl Define the proper name and extra version numbers for package
-PROGRAM="QuakeForge: UQuake"
+PROGRAM="QuakeForge: nuq"
 QSG_VERSION=1.0
 QUAKE_VERSION=1.09
 
@@ -886,7 +886,7 @@ fi
 
 dnl CFLAGS for release and devel versions
 AC_ARG_ENABLE(profile,
-	[  --enable-profile          compile with profiling (for development)],
+	[  --enable-profile        compile with profiling (for development)],
 	profile=$enable_profile
 )
 if test "x$profile" = xyes; then
@@ -936,15 +936,61 @@ dnl ==================================================================
 dnl Find out what to build and finish
 dnl ==================================================================
 
-ENABLE_MGL=yes
-ENABLE_GGI=yes
-ENABLE_SDL=yes
-ENABLE_SGL=yes
-ENABLE_SVGA=yes
-ENABLE_X11=yes
-ENABLE_GLX=yes
-ENABLE_3DFX=yes
-ENABLE_DED=no
+AC_ARG_WITH(clients,
+[  --with-clients=<list>   compile clients in <list>;
+                          mgl ggi sdl sgl svga x11 glx 3dfx],
+  clients="$withval", clients="all")
+if test "$clients" = "all"; then
+	ENABLE_MGL=yes
+	ENABLE_GGI=yes
+	ENABLE_SDL=yes
+	ENABLE_SGL=yes
+	ENABLE_SVGA=yes
+	ENABLE_X11=yes
+	ENABLE_GLX=yes
+	ENABLE_3DFX=yes
+else
+	ENABLE_MGL=no
+	ENABLE_GGI=no
+	ENABLE_SDL=no
+	ENABLE_SGL=no
+	ENABLE_SVGA=no
+	ENABLE_X11=no
+	ENABLE_GLX=no
+	ENABLE_3DFX=no
+	for client in $clients; do
+		case "$client" in
+			mgl)
+				ENABLE_MGL=yes
+				;;
+			ggi)
+				ENABLE_GGI=yes
+				;;
+			sdl)
+				ENABLE_SDL=yes
+				;;
+			sgl)
+				ENABLE_SGL=yes
+				;;
+			svga)
+				ENABLE_SVGA=yes
+				;;
+			x11)
+				ENABLE_X11=yes
+				;;
+			glx)
+				ENABLE_GLX=yes
+				;;
+			3dfx)
+				ENABLE_3DFX=yes
+				;;
+		esac
+	done
+fi
+
+AC_ARG_WITH(server,
+[  --with-server           compile dedicated server],
+  ENABLE_DED="$withval", ENABLE_DED=no)
 
 CL_TARGETS=""
 if test "x$HAVE_MGL" = xyes -a "x$ENABLE_MGL" = xyes; then
@@ -970,7 +1016,7 @@ fi
 if test "x$HAVE_X" = xyes -a "x$ENABLE_X11" = xyes; then
 	TARGETS="$TARGETS $PACKAGE-x11\$(EXEEXT)"
 	CL_TARGETS="$CL_TARGETS X11"
-	if test "x$HAVE_GLX" = xyes; then
+	if test "x$HAVE_GLX" = xyes -a "x$ENABLE_GLX" = xyes; then
 		TARGETS="$TARGETS $PACKAGE-glx\$(EXEEXT)"
 		CL_TARGETS="$CL_TARGETS GLX"
 	fi
@@ -1002,7 +1048,7 @@ AC_MSG_RESULT([
 
 	Build type: $BUILD_TYPE
 	Targets:$CL_TARGETS
-	Server:$ENABLE_DED
+	Server: $ENABLE_DED
 
 	System game data directory: $sharepath
 	Per-user game data directory: $userpath