diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 05a1d0b..d97c523 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -1,5 +1,5 @@
 dnl Initialize autoconf
-AC_INIT([[LLVM-TEST]],[[2.1cvs]],[llvmbugs@cs.uiuc.edu])
+AC_INIT([[LLVM-TEST]],[[2.1]],[llvmbugs@cs.uiuc.edu])
 
 dnl Place all of the extra autoconf files into the config subdirectory
 AC_CONFIG_AUX_DIR([autoconf])
diff --git a/configure b/configure
index 708eab1..baa2c14 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for LLVM-TEST 2.1cvs.
+# Generated by GNU Autoconf 2.60 for LLVM-TEST 2.1.
 #
 # Report bugs to <llvmbugs@cs.uiuc.edu>.
 #
@@ -713,8 +713,8 @@
 # Identity of this package.
 PACKAGE_NAME='LLVM-TEST'
 PACKAGE_TARNAME='-llvm-test-'
-PACKAGE_VERSION='2.1cvs'
-PACKAGE_STRING='LLVM-TEST 2.1cvs'
+PACKAGE_VERSION='2.1'
+PACKAGE_STRING='LLVM-TEST 2.1'
 PACKAGE_BUGREPORT='llvmbugs@cs.uiuc.edu'
 
 ac_unique_file="SingleSource/Benchmarks/Makefile"
@@ -1389,7 +1389,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures LLVM-TEST 2.1cvs to adapt to many kinds of systems.
+\`configure' configures LLVM-TEST 2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1454,7 +1454,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of LLVM-TEST 2.1cvs:";;
+     short | recursive ) echo "Configuration of LLVM-TEST 2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1576,7 +1576,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-LLVM-TEST configure 2.1cvs
+LLVM-TEST configure 2.1
 generated by GNU Autoconf 2.60
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1590,7 +1590,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by LLVM-TEST $as_me 2.1cvs, which was
+It was created by LLVM-TEST $as_me 2.1, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   $ $0 $@
@@ -21254,7 +21254,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by LLVM-TEST $as_me 2.1cvs, which was
+This file was extended by LLVM-TEST $as_me 2.1, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21301,7 +21301,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-LLVM-TEST config.status 2.1cvs
+LLVM-TEST config.status 2.1
 configured by $0, generated by GNU Autoconf 2.60,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"