diff --git a/src/drivers/Makefile b/src/drivers/Makefile
index 3756cf2f1..fd300a9d0 100644
--- a/src/drivers/Makefile
+++ b/src/drivers/Makefile
@@ -15,7 +15,7 @@
 #
 ##############################################################################
 
-SUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v CVS)
+SUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v .svn)
 
 SHIPSUBDIRS = $(SUBDIRS)
 
diff --git a/src/drivers/human/tracks/Makefile b/src/drivers/human/tracks/Makefile
index a36de8f6a..92841204e 100644
--- a/src/drivers/human/tracks/Makefile
+++ b/src/drivers/human/tracks/Makefile
@@ -15,7 +15,7 @@
 #
 ##############################################################################
 
-SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v CVS)
+SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v .svn)
 
 PKGSUBDIRS	= $(SHIPSUBDIRS)
 
diff --git a/src/drivers/inferno2/1/Makefile b/src/drivers/inferno2/1/Makefile
index bc03dfbc1..680d0bdbf 100644
--- a/src/drivers/inferno2/1/Makefile
+++ b/src/drivers/inferno2/1/Makefile
@@ -25,7 +25,7 @@ src-robots-base_PKGDIR		= ${PACKAGE}-${VERSION}/$(subst ${TORCSNG_BASE},,$(shell
 
 # Recursion
 
-SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v CVS)
+SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v .svn)
 
 PKGSUBDIRS  = ${SHIPSUBDIRS}
 
diff --git a/src/drivers/inferno2/10/Makefile b/src/drivers/inferno2/10/Makefile
index 8699783c4..256412b8a 100644
--- a/src/drivers/inferno2/10/Makefile
+++ b/src/drivers/inferno2/10/Makefile
@@ -26,7 +26,7 @@ src-robots-base_PKGDIR		= ${PACKAGE}-${VERSION}/$(subst ${TORCSNG_BASE},,$(shell
 
 # Recursion
 
-SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v CVS)
+SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v .svn)
 
 PKGSUBDIRS  = ${SHIPSUBDIRS}
 
diff --git a/src/drivers/inferno2/2/Makefile b/src/drivers/inferno2/2/Makefile
index 40fd1144e..8309fa37b 100644
--- a/src/drivers/inferno2/2/Makefile
+++ b/src/drivers/inferno2/2/Makefile
@@ -25,7 +25,7 @@ src-robots-base_PKGDIR		= ${PACKAGE}-${VERSION}/$(subst ${TORCSNG_BASE},,$(shell
 
 # Recursion
 
-SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v CVS)
+SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v .svn)
 
 PKGSUBDIRS  = ${SHIPSUBDIRS}
 
diff --git a/src/drivers/inferno2/3/Makefile b/src/drivers/inferno2/3/Makefile
index bc21d6ea3..9d28662a9 100644
--- a/src/drivers/inferno2/3/Makefile
+++ b/src/drivers/inferno2/3/Makefile
@@ -26,7 +26,7 @@ src-robots-base_PKGDIR		= ${PACKAGE}-${VERSION}/$(subst ${TORCSNG_BASE},,$(shell
 
 # Recursion
 
-SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v CVS)
+SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v .svn)
 
 PKGSUBDIRS  = ${SHIPSUBDIRS}
 
diff --git a/src/drivers/inferno2/4/Makefile b/src/drivers/inferno2/4/Makefile
index 6e50de15e..a4d0c1dcd 100644
--- a/src/drivers/inferno2/4/Makefile
+++ b/src/drivers/inferno2/4/Makefile
@@ -26,7 +26,7 @@ src-robots-base_PKGDIR		= ${PACKAGE}-${VERSION}/$(subst ${TORCSNG_BASE},,$(shell
 
 # Recursion
 
-SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v CVS)
+SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v .svn)
 
 PKGSUBDIRS  = ${SHIPSUBDIRS}
 
diff --git a/src/drivers/inferno2/5/Makefile b/src/drivers/inferno2/5/Makefile
index 955c5ef94..bd177f45d 100644
--- a/src/drivers/inferno2/5/Makefile
+++ b/src/drivers/inferno2/5/Makefile
@@ -26,7 +26,7 @@ src-robots-base_PKGDIR		= ${PACKAGE}-${VERSION}/$(subst ${TORCSNG_BASE},,$(shell
 
 # Recursion
 
-SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v CVS)
+SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v .svn)
 
 PKGSUBDIRS  = ${SHIPSUBDIRS}
 
diff --git a/src/drivers/inferno2/6/Makefile b/src/drivers/inferno2/6/Makefile
index 3d451cf2b..bef11a531 100644
--- a/src/drivers/inferno2/6/Makefile
+++ b/src/drivers/inferno2/6/Makefile
@@ -26,7 +26,7 @@ src-robots-base_PKGDIR		= ${PACKAGE}-${VERSION}/$(subst ${TORCSNG_BASE},,$(shell
 
 # Recursion
 
-SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v CVS)
+SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v .svn)
 
 PKGSUBDIRS  = ${SHIPSUBDIRS}
 
diff --git a/src/drivers/inferno2/7/Makefile b/src/drivers/inferno2/7/Makefile
index 48a8beaa7..fceee34e6 100644
--- a/src/drivers/inferno2/7/Makefile
+++ b/src/drivers/inferno2/7/Makefile
@@ -25,7 +25,7 @@ src-robots-base_PKGDIR		= ${PACKAGE}-${VERSION}/$(subst ${TORCSNG_BASE},,$(shell
 
 # Recursion
 
-SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v CVS)
+SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v .svn)
 
 PKGSUBDIRS  = ${SHIPSUBDIRS}
 
diff --git a/src/drivers/inferno2/8/Makefile b/src/drivers/inferno2/8/Makefile
index 0bde41f4c..6f7d2a557 100644
--- a/src/drivers/inferno2/8/Makefile
+++ b/src/drivers/inferno2/8/Makefile
@@ -25,7 +25,7 @@ src-robots-base_PKGDIR		= ${PACKAGE}-${VERSION}/$(subst ${TORCSNG_BASE},,$(shell
 
 # Recursion
 
-SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v CVS)
+SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v .svn)
 
 PKGSUBDIRS  = ${SHIPSUBDIRS}
 
diff --git a/src/drivers/inferno2/9/Makefile b/src/drivers/inferno2/9/Makefile
index 7ecaa5bd2..f456306e5 100644
--- a/src/drivers/inferno2/9/Makefile
+++ b/src/drivers/inferno2/9/Makefile
@@ -25,7 +25,7 @@ src-robots-base_PKGDIR		= ${PACKAGE}-${VERSION}/$(subst ${TORCSNG_BASE},,$(shell
 
 # Recursion
 
-SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v CVS)
+SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v .svn)
 
 PKGSUBDIRS  = ${SHIPSUBDIRS}
 
diff --git a/src/drivers/inferno2/Makefile b/src/drivers/inferno2/Makefile
index c12c3af8f..c34a232b7 100644
--- a/src/drivers/inferno2/Makefile
+++ b/src/drivers/inferno2/Makefile
@@ -27,7 +27,7 @@ SHIPDIR   = drivers/${ROBOT}
 
 SHIP      = ${ROBOT}.xml logo.rgb
 
-SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v CVS | grep -v tracksdata)
+SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v .svn | grep -v tracksdata)
 
 PKGSUBDIRS		= ${SHIPSUBDIRS}
 
diff --git a/src/drivers/sparkle/Makefile b/src/drivers/sparkle/Makefile
index 438120f5c..0e17979bf 100644
--- a/src/drivers/sparkle/Makefile
+++ b/src/drivers/sparkle/Makefile
@@ -22,7 +22,7 @@ SOURCES     = ${ROBOT}.cpp driver.cpp opponent.cpp spline.cpp pit.cpp
 
 SHIPDIR     = drivers/${ROBOT}
 SHIP        = ${ROBOT}.xml logo.rgb
-SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v CVS)
+SHIPSUBDIRS = $(shell find * -maxdepth 0 -type d -print | grep -v .svn)
 
 PKGSUBDIRS  = ${SHIPSUBDIRS}
 src-robots-base_PKGFILES = $(shell find * -maxdepth 0 -type f -print)
diff --git a/src/modules/graphic/Makefile b/src/modules/graphic/Makefile
index f84737461..c00761e68 100644
--- a/src/modules/graphic/Makefile
+++ b/src/modules/graphic/Makefile
@@ -16,7 +16,7 @@
 ##############################################################################
 
 
-#SUBDIRS		= $(shell find * -maxdepth 0 -type d -print | grep -v CVS)
+#SUBDIRS		= $(shell find * -maxdepth 0 -type d -print | grep -v .svn)
 
 SUBDIRS		= ssggraph
 
diff --git a/src/modules/simu/Makefile b/src/modules/simu/Makefile
index ffab924a9..bba3d9647 100644
--- a/src/modules/simu/Makefile
+++ b/src/modules/simu/Makefile
@@ -16,12 +16,12 @@
 ##############################################################################
 
 
-#SUBDIRS		= $(shell find * -maxdepth 0 -type d -print | grep -v CVS)
-SUBDIRS		= simuv2
+SUBDIRS		= $(shell find * -maxdepth 0 -type d -print | grep -v .svn)
+#SUBDIRS		= simuv2
 
 DATASUBDIRS	= $(SUBDIRS)
 
-EXPINCDIRS	= $(shell find * -maxdepth 0 -type d -print | grep -v CVS)
+EXPINCDIRS	= $(shell find * -maxdepth 0 -type d -print | grep -v .svn)
 
 PKGSUBDIRS	= $(SUBDIRS)
 
diff --git a/src/tools/Makefile b/src/tools/Makefile
index 05806d728..095c167f2 100644
--- a/src/tools/Makefile
+++ b/src/tools/Makefile
@@ -17,7 +17,7 @@
 
 
 
-SUBDIRS		= $(shell find * -maxdepth 0 -type d -print | grep -v CVS)
+SUBDIRS		= $(shell find * -maxdepth 0 -type d -print | grep -v .svn)
 
 TOOLSUBDIRS	= $(SUBDIRS)
 
diff --git a/src/tools/package/Makefile b/src/tools/package/Makefile
index b90e1c3f2..ee0deaa8e 100644
--- a/src/tools/package/Makefile
+++ b/src/tools/package/Makefile
@@ -16,7 +16,7 @@
 ##############################################################################
 
 
-SUBDIRS	      = $(shell find * -maxdepth 0 -type d -print | grep -v CVS)
+SUBDIRS	      = $(shell find * -maxdepth 0 -type d -print | grep -v .svn)
 
 PKGSUBDIRS     = $(SUBDIRS)
 
diff --git a/src/windows/Makefile b/src/windows/Makefile
index 75d787021..b77c7f636 100644
--- a/src/windows/Makefile
+++ b/src/windows/Makefile
@@ -16,7 +16,7 @@
 ##############################################################################
 
 
-PKGSUBDIRS	= $(shell find * -maxdepth 0 -type d -print | grep -v CVS)
+PKGSUBDIRS	= $(shell find * -maxdepth 0 -type d -print | grep -v .svn)
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
diff --git a/src/windows/include/Makefile b/src/windows/include/Makefile
index 6de3870fd..7ea39023c 100644
--- a/src/windows/include/Makefile
+++ b/src/windows/include/Makefile
@@ -16,7 +16,7 @@
 ##############################################################################
 
 
-PKGSUBDIRS	= $(shell find * -maxdepth 0 -type d -print | grep -v CVS)
+PKGSUBDIRS	= $(shell find * -maxdepth 0 -type d -print | grep -v .svn)
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)