diff --git a/THANKS b/THANKS
index 72ca55b..31da263 100644
--- a/THANKS
+++ b/THANKS
@@ -18,8 +18,9 @@ Ryan C. Gordon			<icculus@clutteredmind.org>
 Peter Hardy			<peter@hardy.dropbear.id.au>
 Chris Ison			<wildcode@quakeforge.net>
 Ragnvald Maartman-Moe IV	<despair@quakeforge.net>
-'RvB'				<hansmaulwurf@blinkenlights.ch>
+Brady McCary			<mccary@tamu.edu>
 Faried Nawaz			<fn@hungry.org>
+'RvB'				<hansmaulwurf@blinkenlights.ch>
 Victor Shkamerda		<vvs@auto.bnm.org>
 Jeff Teunissen			<deek@quakeforge.net>
 Ulrich 'Q' Spoerlein		<q@uni.de>
diff --git a/bootstrap b/bootstrap
index 2ca0e01..8cbef36 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,8 @@
 #!/bin/sh
 # bootstrap the build when checking out from CVS
 
+export WANT_AUTOMAKE_1_6=1
+
 if [ "$1" = "clean" ]; then
     # quick hack to remove extra generated files that make distclean
     # doesn't remove