diff --git a/External/Makefile b/External/Makefile
index e2ca8a7..8dee2cf 100644
--- a/External/Makefile
+++ b/External/Makefile
@@ -8,7 +8,7 @@
 #
 # Create the list of directories to compile
 #
-DIRS := $(sort $(filter-out CVS/, $(wildcard */)))
+DIRS := SPEC
 ifndef USE_SPEC
 DIRS := $(filter-out SPEC/, $(DIRS))
 endif
diff --git a/External/SPEC/Makefile b/External/SPEC/Makefile
index 3c87db0..f717e8c 100644
--- a/External/SPEC/Makefile
+++ b/External/SPEC/Makefile
@@ -1,3 +1,3 @@
 LEVEL = ../../../..
-DIRS := $(sort $(filter-out CVS/, $(wildcard */)))
+DIRS := CFP2000 CINT2000
 include ${LEVEL}/test/Programs/Makefile.programs
diff --git a/MultiSource/Benchmarks/FreeBench/Makefile b/MultiSource/Benchmarks/FreeBench/Makefile
index acca78b..d2c7e8e 100644
--- a/MultiSource/Benchmarks/FreeBench/Makefile
+++ b/MultiSource/Benchmarks/FreeBench/Makefile
@@ -1,6 +1,6 @@
 # MultiSource/Olden Makefile:  Build all subdirectories automatically
 
 LEVEL = ../../../../..
-PARALLEL_DIRS  := $(filter-out %-disabled/, $(sort $(filter-out CVS/, $(wildcard */))))
+PARALLEL_DIRS  := distray mason pcompress2 analyzer fourinarow neural pifft
 
 include $(LEVEL)/test/Programs/Makefile.programs
diff --git a/MultiSource/Benchmarks/McCat/Makefile b/MultiSource/Benchmarks/McCat/Makefile
index c277a3a..706af64 100644
--- a/MultiSource/Benchmarks/McCat/Makefile
+++ b/MultiSource/Benchmarks/McCat/Makefile
@@ -1,6 +1,7 @@
 # MultiSource/McCat Makefile:  Build all subdirectories automatically
 
 LEVEL = ../../../../..
-PARALLEL_DIRS  := $(filter-out %-disabled/, $(sort $(filter-out CVS/, $(wildcard */))))
+PARALLEL_DIRS  := 01-qbsort 04-bisect 08-main 12-IOtest 17-bintr 03-testtrie 05-eks 09-vor 15-trie 18-imp
+
 
 include $(LEVEL)/test/Programs/Makefile.programs
diff --git a/MultiSource/Benchmarks/Olden/Makefile b/MultiSource/Benchmarks/Olden/Makefile
index acca78b..dda2557 100644
--- a/MultiSource/Benchmarks/Olden/Makefile
+++ b/MultiSource/Benchmarks/Olden/Makefile
@@ -1,6 +1,7 @@
 # MultiSource/Olden Makefile:  Build all subdirectories automatically
 
 LEVEL = ../../../../..
-PARALLEL_DIRS  := $(filter-out %-disabled/, $(sort $(filter-out CVS/, $(wildcard */))))
+PARALLEL_DIRS  := bh em3d mst power tsp bisort health perimeter treeadd voronoi
+
 
 include $(LEVEL)/test/Programs/Makefile.programs
diff --git a/MultiSource/Benchmarks/Ptrdist/Makefile b/MultiSource/Benchmarks/Ptrdist/Makefile
index 3ec0d5f..8a96fae 100644
--- a/MultiSource/Benchmarks/Ptrdist/Makefile
+++ b/MultiSource/Benchmarks/Ptrdist/Makefile
@@ -1,6 +1,7 @@
 # MultiSource/Ptrdist Makefile:  Build all subdirectories automatically
 
 LEVEL = ../../../../..
-PARALLEL_DIRS  := $(filter-out %-disabled/, $(sort $(filter-out CVS/, $(wildcard */))))
+PARALLEL_DIRS  := anagram bc ft ks yacr2
+
 
 include $(LEVEL)/test/Programs/Makefile.programs