diff --git a/runtime/GCCLibraries/Makefile b/runtime/GCCLibraries/Makefile
index 745dc05ddfe..be50161bf97 100644
--- a/runtime/GCCLibraries/Makefile
+++ b/runtime/GCCLibraries/Makefile
@@ -9,10 +9,7 @@
 # llvm/runtime/GCCLibraries Makefile:  Build all subdirectories automatically
 
 LEVEL = ../..
-include $(LEVEL)/Makefile.config
-PARALLEL_DIRS  := $(sort $(filter-out README.txt, $(filter-out Makefile, $(filter-out Output, $(filter-out CVS, $(notdir $(wildcard $(SourceDir)/*)))))))
-PARALLEL_DIRS := $(filter-out libexception/, $(PARALLEL_DIRS))
-
+PARALLEL_DIRS := crtend libc libcurses libg libgcc libgdbm libm libmalloc libtermcap libucb libutempter libutil
 include $(LEVEL)/Makefile.common
 
 # Install target for libraries: Copy into the gcc install directory in chris's
diff --git a/runtime/Makefile b/runtime/Makefile
index d8bc24a6f12..a5d3d81e3cb 100644
--- a/runtime/Makefile
+++ b/runtime/Makefile
@@ -10,11 +10,12 @@
 
 LEVEL = ..
 include $(LEVEL)/Makefile.config
+
 ifneq ($(wildcard $(LLVMGCCDIR)),)
-PARALLEL_DIRS  := $(sort $(filter-out Makefile, $(filter-out README.txt, $(filter-out Output, $(filter-out CVS, $(notdir $(wildcard $(SourceDir)/*)))))))
+PARALLEL_DIRS  := GCCLibraries  libdummy  libprofile  libtrace
 else
 PARALLEL_DIRS  := 
-all ::
+install all ::
 	@echo '********' Warning: Your LLVMGCCDIR is set incorrectly.  Double-check 
 	@echo '********' Warning: llvm/Makefile.config to make sure it matches
 	@echo '********' Warning: the directory where the C front-end is installed,