diff --git a/livesupport/bin/dist.sh b/livesupport/bin/dist.sh
index 0b30ca565..610108cbd 100755
--- a/livesupport/bin/dist.sh
+++ b/livesupport/bin/dist.sh
@@ -229,9 +229,9 @@ cp -pPR README INSTALL configure $ls_tmpdir
 
 
 #-------------------------------------------------------------------------------
-#  Get rid of the remnants of the CVS system
+#  Get rid of the remnants of the subversion system
 #-------------------------------------------------------------------------------
-rm -rf `find $ls_tmpdir -name CVS -type d`
+rm -rf `find $ls_tmpdir -name .svn -type d`
 
 
 #-------------------------------------------------------------------------------
@@ -313,9 +313,9 @@ cp -pPR $pear_dir/* $pear_tmpdir
 
 
 #-------------------------------------------------------------------------------
-#  Get rid of the remnants of the CVS system
+#  Get rid of the remnants of the subversion system
 #-------------------------------------------------------------------------------
-rm -rf `find $ls_tmpdir -name CVS -type d`
+rm -rf `find $ls_tmpdir -name .svn -type d`
 
 
 #-------------------------------------------------------------------------------
diff --git a/livesupport/src/modules/alib/etc/Makefile.in b/livesupport/src/modules/alib/etc/Makefile.in
index 3422ffb90..a3a3a9ce3 100644
--- a/livesupport/src/modules/alib/etc/Makefile.in
+++ b/livesupport/src/modules/alib/etc/Makefile.in
@@ -41,7 +41,7 @@ CP      = cp -f
 #-------------------------------------------------------------------------------
 
 MODULE_NAME = alib
-TAR_C       = tar -cj --exclude CVS --exclude '*~' -C ${BASE_DIR} -f
+TAR_C       = tar -cj --exclude .svn --exclude '*~' -C ${BASE_DIR} -f
 DIST_EXT    = .tgz
 DATE        = `date +%y%m%d`
 
diff --git a/livesupport/src/modules/archiveServer/etc/Makefile.in b/livesupport/src/modules/archiveServer/etc/Makefile.in
index 7522029c4..e419cf8f6 100644
--- a/livesupport/src/modules/archiveServer/etc/Makefile.in
+++ b/livesupport/src/modules/archiveServer/etc/Makefile.in
@@ -44,7 +44,7 @@ CAT     = cat
 #-------------------------------------------------------------------------------
 
 MODULE_NAME = archiveServer
-TAR_C       = tar -cj --exclude CVS --exclude '*~' -C ${BASE_DIR} -f
+TAR_C       = tar -cj --exclude .svn --exclude '*~' -C ${BASE_DIR} -f
 DIST_EXT    = .tgz
 DATE        = `date +%y%m%d`
 
diff --git a/livesupport/src/modules/getid3/etc/Makefile.in b/livesupport/src/modules/getid3/etc/Makefile.in
index 078aad126..cc8ddbcf6 100644
--- a/livesupport/src/modules/getid3/etc/Makefile.in
+++ b/livesupport/src/modules/getid3/etc/Makefile.in
@@ -42,7 +42,7 @@ CP      = cp -f
 #-------------------------------------------------------------------------------
 
 MODULE_NAME = getid3
-TAR_C       = tar -cj --exclude CVS --exclude '*~' -C ${BASE_DIR} -f
+TAR_C       = tar -cj --exclude .svn --exclude '*~' -C ${BASE_DIR} -f
 DIST_EXT    = .tgz
 DATE        = `date +%y%m%d`
 
diff --git a/livesupport/src/modules/htmlUI/etc/Makefile.in b/livesupport/src/modules/htmlUI/etc/Makefile.in
index bbe0bf9cd..453e02456 100644
--- a/livesupport/src/modules/htmlUI/etc/Makefile.in
+++ b/livesupport/src/modules/htmlUI/etc/Makefile.in
@@ -45,7 +45,7 @@ CAT     = cat
 #-------------------------------------------------------------------------------
 
 MODULE_NAME = htmlUI
-TAR_C       = tar -cj --exclude CVS --exclude '*~' -C ${BASE_DIR} -f
+TAR_C       = tar -cj --exclude .svn --exclude '*~' -C ${BASE_DIR} -f
 DIST_EXT    = .tgz
 DATE        = `date +%y%m%d`
 
diff --git a/livesupport/src/modules/storageAdmin/etc/Makefile.in b/livesupport/src/modules/storageAdmin/etc/Makefile.in
index 81c7ddbb1..5aad3f75d 100644
--- a/livesupport/src/modules/storageAdmin/etc/Makefile.in
+++ b/livesupport/src/modules/storageAdmin/etc/Makefile.in
@@ -45,7 +45,7 @@ CAT     = cat
 #-------------------------------------------------------------------------------
 
 MODULE_NAME = getid3
-TAR_C       = tar -cj --exclude CVS --exclude '*~' -C ${BASE_DIR} -f
+TAR_C       = tar -cj --exclude .svn --exclude '*~' -C ${BASE_DIR} -f
 DIST_EXT    = .tgz
 DATE        = `date +%y%m%d`
 
diff --git a/livesupport/src/modules/storageServer/etc/Makefile.in b/livesupport/src/modules/storageServer/etc/Makefile.in
index 8e27f1d7f..ed37a1126 100644
--- a/livesupport/src/modules/storageServer/etc/Makefile.in
+++ b/livesupport/src/modules/storageServer/etc/Makefile.in
@@ -45,7 +45,7 @@ PHP     = php
 #-------------------------------------------------------------------------------
 
 MODULE_NAME = storageServer
-TAR_C       = tar -cj --exclude CVS --exclude '*~' -C ${BASE_DIR} -f
+TAR_C       = tar -cj --exclude .svn --exclude '*~' -C ${BASE_DIR} -f
 DIST_EXT    = .tgz
 DATE        = `date +%y%m%d`