diff --git a/Documentation/Developers/CHANGELOG-CLIFFORD b/Documentation/Developers/CHANGELOG-CLIFFORD
index 3b41fd6f2..94d002fef 100644
--- a/Documentation/Developers/CHANGELOG-CLIFFORD
+++ b/Documentation/Developers/CHANGELOG-CLIFFORD
@@ -1,18 +1,22 @@
 
-*) 2003-09-27 (2.0.0-camp - 2.0.0-rc1)
+*) 2003-09-29 (2.0.0-rc1 - 2.0.0-rc2)
+
+ - Auto-remove CVS and .svn directories in $srcdir
+
+*) 2003-09-27 (2.0.0-rc1 - 2.0.0-rc2)
 
  - Updated mine-0.15 and made neccassary adoptions in scripts/functions
 
-*) 2003-09-24 (2.0.0-camp - 2.0.0-rc1)
+*) 2003-09-24 (2.0.0-rc1 - 2.0.0-rc2)
 
  - Fixed *.Z to *.bz2 conversion in Download script
 
-*) 2003-09-20 (2.0.0-camp - 2.0.0-rc1)
+*) 2003-09-20 (2.0.0-rc1 - 2.0.0-rc2)
 
  - Added "no broken deps" feature to scripts/Create-PkgQueue
  - Some minor Emerge-Pkg enhancements and fixes
 
-*) 2003-08-26 (2.0.0-camp - 2.0.0-rc1)
+*) 2003-08-26 (2.0.0-rc1 - 2.0.0-rc2)
 
  - Added packages cpuid and syslinux
  - Added framework for "package preselection templates"
diff --git a/Documentation/Developers/PKG-BUILD-VARS b/Documentation/Developers/PKG-BUILD-VARS
index 220deee5b..0b5cd3b01 100644
--- a/Documentation/Developers/PKG-BUILD-VARS
+++ b/Documentation/Developers/PKG-BUILD-VARS
@@ -54,6 +54,7 @@ includedir .... where the header files should be installed
 autoextract ... '0' = skip automatic untar
 autopatch ..... '0' = skip automatic patching
 chownsrcdir ... '0' = don't make a chown to root after extracting the $srctar
+nocvsinsrcdir . '0' = don't remove CVS and .svn directories in $srcdir
 srctar ........ filename of source tar file ('auto' = autodetect)
 srcdir ........ directory in source tar file ('auto' = autodetect)
 xsrctar ....... filename of source tar file after 'auto' has been processed
diff --git a/scripts/Build-Pkg b/scripts/Build-Pkg
index c438dac20..da22cc0ff 100755
--- a/scripts/Build-Pkg
+++ b/scripts/Build-Pkg
@@ -420,7 +420,7 @@ taropt="--use-compress-program=bzip2 -xf"
 
 mainfunction="build_this_package"
 runconf=1 ; runxmkmf=1 ; runmkpl=1 ; runpysetup=1 ; autopatch=1
-autoextract=1 ; chownsrcdir=1 ; patchopt="-bfp1 -z .orig"
+autoextract=1 ; chownsrcdir=1 ; nocvsinsrcdir=1; patchopt="-bfp1 -z .orig"
 createprefix=1 ; createdocs="" ; rmemptydir=""
 
 check_shared=1
diff --git a/scripts/functions b/scripts/functions
index 78dc2dd24..667ff84ee 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -493,7 +493,7 @@ build_this_package() {
 		if [ $autoextract = 1 ]; then
 			echo "Extracting $xsrctar ($taropt) ... "
 			cd $builddir
-			tar -v $taropt $archdir/$xsrctar |
+			tar -v $taropt $archdir/$xsrctar | tee untar.txt |
 				cut -f1 -d/ | sort -u > xsrcdir.txt
 			#
 			if [ $srcdir = auto ]; then
@@ -509,8 +509,21 @@ build_this_package() {
 				xsrcdir="$srcdir"
 			fi
 			#
+			if [ "$chownsrcdir" = 1 ]; then
+				echo "Fixing ownership and permissions ..."
+				chown -R 0.0 $builddir/$xsrcdir
+			fi
+			#
+			if [ "$nocvsinsrcdir" = 1 ]; then
+				echo "Removing CVS and .svn directories ..."
+				egrep '(^|/)(CVS|\.svn)(/|$)' untar.txt |
+				while read x; do
+					echo "Removing $x ..."
+					rm -rf "$x"
+				done
+			fi
+			#
 			echo "Changeing into $builddir/$xsrcdir ..."
-			[ "$chownsrcdir" = 1 ] && chown -R 0.0 $builddir/$xsrcdir
 			cd $builddir/$xsrcdir
 
 			# Apply patches