diff --git a/VERSION b/VERSION
index 9e5909a6aa..f8d92d89a0 100644
--- a/VERSION
+++ b/VERSION
@@ -3,4 +3,4 @@ minor=0
 release=0
 alpha=1
 beta=0
-cvs=1
+svn=1
diff --git a/autogen.sh b/autogen.sh
index 307cc1deef..76ff944273 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -505,7 +505,7 @@ EOF
                 pd_ver_release="`echo $pd_ver | cut -d: -f4`"
                 pd_ver_alpha="`echo $pd_ver | cut -d: -f5`"
                 pd_ver_beta="`echo $pd_ver | cut -d: -f6`"
-                pd_ver_cvs="`echo $pd_ver | cut -d: -f7`"
+                pd_ver_svn="`echo $pd_ver | cut -d: -f7`"
                 cat >> $pd_list_file <<EOF
 
 MCA_${pd_module_type}_NO_CONFIGURE_SUBDIRS="$pd_dir \$MCA_${pd_module_type}_NO_CONFIGURE_SUBDIRS"
@@ -532,9 +532,9 @@ AC_DEFINE_UNQUOTED(MCA_${pd_module_type}_${pd_module_name}_ALPHA_VERSION,
 AC_DEFINE_UNQUOTED(MCA_${pd_module_type}_${pd_module_name}_BETA_VERSION, 
     $pd_ver_beta,
     [Beta LAM MCA $pd_module_type $pd_module_name version])
-AC_DEFINE_UNQUOTED(MCA_${pd_module_type}_${pd_module_name}_CVS_VERSION, 
-    $pd_ver_cvs,
-    [CVS LAM MCA $pd_module_type $pd_module_name version])
+AC_DEFINE_UNQUOTED(MCA_${pd_module_type}_${pd_module_name}_SVN_VERSION, 
+    $pd_ver_svn,
+    [SVN LAM MCA $pd_module_type $pd_module_name version])
 AC_DEFINE_UNQUOTED(MCA_${pd_module_type}_${pd_module_name}_FULL_VERSION, 
     "$pd_ver_full",
     [Full LAM MCA $pd_module_type $pd_module_name version])
@@ -686,7 +686,7 @@ done
 echo "[Checking] prerequisites"
 
 # sanity check to make sure user isn't being stupid
-if test ! -d CVS -a ! -d .svn ; then
+if test ! -d .svn ; then
     cat <<EOF
 
 This doesn't look like a developer copy of LAM/MPI.  You probably do not
diff --git a/config/lam_get_version.m4 b/config/lam_get_version.m4
index 94b0bb6221..c88286e651 100644
--- a/config/lam_get_version.m4
+++ b/config/lam_get_version.m4
@@ -24,7 +24,7 @@ gv_run minor   MINOR_VERSION
 gv_run release RELEASE_VERSION
 gv_run alpha   ALPHA_VERSION
 gv_run beta    BETA_VERSION
-gv_run cvs     CVS_VERSION
+gv_run svn     SVN_VERSION
 
 # Clean up
 
diff --git a/config/lam_get_version.sh b/config/lam_get_version.sh
index 3d2d957524..eb7b68b701 100755
--- a/config/lam_get_version.sh
+++ b/config/lam_get_version.sh
@@ -19,7 +19,7 @@ else
     LAM_RELEASE_VERSION="`cat $srcfile | grep release | cut -d= -f2`"
     LAM_ALPHA_VERSION="`cat $srcfile | grep alpha | cut -d= -f2`"
     LAM_BETA_VERSION="`cat $srcfile | grep beta | cut -d= -f2`"
-    LAM_CVS_VERSION="`cat $srcfile | grep cvs | cut -d= -f2`"
+    LAM_SVN_VERSION="`cat $srcfile | grep svn | cut -d= -f2`"
     if test "$LAM_RELEASE_VERSION" != "0" -a "$LAM_RELEASE_VERSION" != ""; then
 	LAM_VERSION="$LAM_MAJOR_VERSION.$LAM_MINOR_VERSION.$LAM_RELEASE_VERSION"
     else
@@ -32,10 +32,10 @@ else
 	LAM_VERSION="${LAM_VERSION}b$LAM_BETA_VERSION"
     fi
 
-    if test "$LAM_CVS_VERSION" = "1"; then
-	LAM_VERSION="${LAM_VERSION}cvs"
-    elif test "`expr $LAM_CVS_VERSION \> 0`" = "1"; then
-	LAM_VERSION="${LAM_VERSION}cvs$LAM_CVS_VERSION"
+    if test "$LAM_SVN_VERSION" = "1"; then
+	LAM_VERSION="${LAM_VERSION}svn"
+    elif test "`expr $LAM_SVN_VERSION \> 0`" = "1"; then
+	LAM_VERSION="${LAM_VERSION}svn$LAM_SVN_VERSION"
     fi
 
     if test "$option" = ""; then
@@ -62,11 +62,11 @@ case "$option" in
     --beta)
 	echo $LAM_BETA_VERSION
 	;;
-    --cvs)
-	echo $LAM_CVS_VERSION
+    --svn)
+	echo $LAM_SVN_VERSION
 	;;
     --all)
-        echo ${LAM_VERSION}:${LAM_MAJOR_VERSION}:${LAM_MINOR_VERSION}:${LAM_RELEASE_VERSION}:${LAM_ALPHA_VERSION}:${LAM_BETA_VERSION}:${LAM_CVS_VERSION}
+        echo ${LAM_VERSION}:${LAM_MAJOR_VERSION}:${LAM_MINOR_VERSION}:${LAM_RELEASE_VERSION}:${LAM_ALPHA_VERSION}:${LAM_BETA_VERSION}:${LAM_SVN_VERSION}
         ;;
     -h|--help)
 	cat <<EOF
@@ -80,7 +80,7 @@ $0 <srcfile> [<option>]
     --release - Release version number
     --alpha   - Alpha version number
     --beta    - Beta version nmumber
-    --cvs     - CVS date stamp
+    --svn     - Subversion repository number
     --all     - Show all version numbers, separated by :
     --help    - This message
 EOF
diff --git a/configure.ac b/configure.ac
index 29b35cf91c..a2b6c185df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ AC_DEFINE_UNQUOTED(LAM_ALPHA_VERSION, $LAM_ALPHA_VERSION,
     [Alpha LAM version])
 AC_DEFINE_UNQUOTED(LAM_BETA_VERSION, $LAM_BETA_VERSION, 
     [Beta LAM version])
-AC_DEFINE_UNQUOTED(LAM_CVS_VERSION, $LAM_CVS_VERSION, 
+AC_DEFINE_UNQUOTED(LAM_SVN_VERSION, $LAM_SVN_VERSION, 
     [CVS LAM version])
 AC_DEFINE_UNQUOTED(LAM_VERSION, "$LAM_VERSION", 
     [Overall LAM version number])
diff --git a/src/mca/coll/basic/VERSION b/src/mca/coll/basic/VERSION
index 7324bfc5e9..05a12d4a75 100644
--- a/src/mca/coll/basic/VERSION
+++ b/src/mca/coll/basic/VERSION
@@ -3,4 +3,4 @@ minor=0
 release=0
 alpha=0
 beta=0
-cvs=1
+svn=1
diff --git a/src/mca/io/romio/VERSION b/src/mca/io/romio/VERSION
index 54f912ce99..dadc1f42ab 100644
--- a/src/mca/io/romio/VERSION
+++ b/src/mca/io/romio/VERSION
@@ -3,4 +3,4 @@ minor=0
 release=0
 alpha=0
 beta=0
-cvs=1
+svn=1
diff --git a/src/mca/oob/cofs/VERSION b/src/mca/oob/cofs/VERSION
index 54f912ce99..dadc1f42ab 100644
--- a/src/mca/oob/cofs/VERSION
+++ b/src/mca/oob/cofs/VERSION
@@ -3,4 +3,4 @@ minor=0
 release=0
 alpha=0
 beta=0
-cvs=1
+svn=1
diff --git a/src/mca/pcm/cofs/VERSION b/src/mca/pcm/cofs/VERSION
index 54f912ce99..dadc1f42ab 100644
--- a/src/mca/pcm/cofs/VERSION
+++ b/src/mca/pcm/cofs/VERSION
@@ -3,4 +3,4 @@ minor=0
 release=0
 alpha=0
 beta=0
-cvs=1
+svn=1
diff --git a/src/mca/pcm/rsh/VERSION b/src/mca/pcm/rsh/VERSION
index 54f912ce99..dadc1f42ab 100644
--- a/src/mca/pcm/rsh/VERSION
+++ b/src/mca/pcm/rsh/VERSION
@@ -3,4 +3,4 @@ minor=0
 release=0
 alpha=0
 beta=0
-cvs=1
+svn=1
diff --git a/src/mca/pml/teg/VERSION b/src/mca/pml/teg/VERSION
index 54f912ce99..dadc1f42ab 100644
--- a/src/mca/pml/teg/VERSION
+++ b/src/mca/pml/teg/VERSION
@@ -3,4 +3,4 @@ minor=0
 release=0
 alpha=0
 beta=0
-cvs=1
+svn=1
diff --git a/src/mca/ptl/tcp/VERSION b/src/mca/ptl/tcp/VERSION
index 54f912ce99..dadc1f42ab 100644
--- a/src/mca/ptl/tcp/VERSION
+++ b/src/mca/ptl/tcp/VERSION
@@ -3,4 +3,4 @@ minor=0
 release=0
 alpha=0
 beta=0
-cvs=1
+svn=1
diff --git a/src/mca/registry/cofs/VERSION b/src/mca/registry/cofs/VERSION
index 54f912ce99..dadc1f42ab 100644
--- a/src/mca/registry/cofs/VERSION
+++ b/src/mca/registry/cofs/VERSION
@@ -3,4 +3,4 @@ minor=0
 release=0
 alpha=0
 beta=0
-cvs=1
+svn=1
diff --git a/src/mca/topo/unity/VERSION b/src/mca/topo/unity/VERSION
index 7324bfc5e9..05a12d4a75 100644
--- a/src/mca/topo/unity/VERSION
+++ b/src/mca/topo/unity/VERSION
@@ -3,4 +3,4 @@ minor=0
 release=0
 alpha=0
 beta=0
-cvs=1
+svn=1
diff --git a/src/tools/laminfo/laminfo.h b/src/tools/laminfo/laminfo.h
index 82e994354d..c174f8cda3 100644
--- a/src/tools/laminfo/laminfo.h
+++ b/src/tools/laminfo/laminfo.h
@@ -40,7 +40,7 @@ namespace laminfo {
   extern const std::string ver_release;
   extern const std::string ver_alpha;
   extern const std::string ver_beta;
-  extern const std::string ver_cvs;
+  extern const std::string ver_svn;
 
   void do_version(bool want_all, lam_cmd_line_t *cmd_line);
   void show_lam_version(const std::string& scope);
diff --git a/src/tools/laminfo/version.cc b/src/tools/laminfo/version.cc
index aa0ee82417..45735f30c5 100644
--- a/src/tools/laminfo/version.cc
+++ b/src/tools/laminfo/version.cc
@@ -26,7 +26,7 @@ const string laminfo::ver_minor = "minor";
 const string laminfo::ver_release = "release";
 const string laminfo::ver_alpha = "alpha";
 const string laminfo::ver_beta = "beta";
-const string laminfo::ver_cvs = "cvs";
+const string laminfo::ver_svn = "svn";
 
 //
 // Private variables
@@ -46,7 +46,7 @@ static void show_mca_version(const mca_base_module_t *module,
                              const string& scope, const string& ver_type);
 static string make_version_str(const string& scope,
                                int major, int minor, int release, int alpha, 
-                               int beta, int cvs);
+                               int beta, int svn);
 
 //
 // do_version
@@ -111,7 +111,7 @@ void laminfo::show_lam_version(const string& scope)
       make_version_str(scope, 
                        LAM_MAJOR_VERSION, LAM_MINOR_VERSION, 
                        LAM_RELEASE_VERSION, 
-                       LAM_ALPHA_VERSION, LAM_BETA_VERSION, LAM_CVS_VERSION));
+                       LAM_ALPHA_VERSION, LAM_BETA_VERSION, LAM_SVN_VERSION));
 }
 
 
@@ -232,7 +232,7 @@ static void show_mca_version(const mca_base_module_t* module,
 
 static string make_version_str(const string& scope,
                                int major, int minor, int release, int alpha, 
-                               int beta, int cvs)
+                               int beta, int svn)
 {
   string str;
   char temp[BUFSIZ];
@@ -253,10 +253,10 @@ static string make_version_str(const string& scope,
       snprintf(temp, BUFSIZ - 1, "b%d", beta);
       str += temp;
     }
-    if (cvs > 0) {
-      str += "cvs";
-      if (cvs > 1) {
-        snprintf(temp, BUFSIZ - 1, "%d", cvs);
+    if (svn > 0) {
+      str += "svn";
+      if (svn > 1) {
+        snprintf(temp, BUFSIZ - 1, "%d", svn);
         str += temp;
       }
     }
@@ -270,8 +270,8 @@ static string make_version_str(const string& scope,
     snprintf(temp, BUFSIZ - 1, "%d", alpha);
   else if (scope == ver_beta)
     snprintf(temp, BUFSIZ - 1, "%d", beta);
-  else if (scope == ver_cvs)
-    snprintf(temp, BUFSIZ - 1, "%d", cvs);
+  else if (scope == ver_svn)
+    snprintf(temp, BUFSIZ - 1, "%d", svn);
   else {
 #if 0
     show_help("laminfo", "usage");