diff --git a/Configure.pl b/Configure.pl
index 1c1758281d5..67f26c506f2 100644
--- a/Configure.pl
+++ b/Configure.pl
@@ -106,8 +106,8 @@ sub done {
 
 You can now use 'make' to build Rakudo Perl.
 After that, you can use 'make test' to run some local tests,
-or 'make spectest' to obtain a copy of the spectest suite
-and test that.
+or 'make spectest' to check out (via svn) a copy of the Perl 6
+official test suite and run its tests.
 
 END
     exit 0;
diff --git a/config/makefiles/root.in b/config/makefiles/root.in
index 5eebbb756f7..a6f0c3cc490 100644
--- a/config/makefiles/root.in
+++ b/config/makefiles/root.in
@@ -4,11 +4,18 @@
 # arguments we want to run parrot with
 PARROT_ARGS =
 
-# places to look for things
+# values from parrot_config
 BUILD_DIR     = @build_dir@
+LOAD_EXT      = @load_ext@
+O             = @o@
+EXE           = @exe@
+MAKE          = @make_c@
+PERL          = @perl@
+RM_F          = @rm_f@
+
+# Various paths
 PARROT_DYNEXT = $(BUILD_DIR)/runtime/parrot/dynext
-PGE_LIBRARY   = $(BUILD_DIR)/runtime/parrot/library/PGE
-PERL6GRAMMAR  = $(PGE_LIBRARY)/Perl6Grammar.pbc
+PERL6GRAMMAR  = $(BUILD_DIR)/runtime/parrot/library/PGE/Perl6Grammar.pbc
 NQP           = $(BUILD_DIR)/compilers/nqp/nqp.pbc
 PCT           = $(BUILD_DIR)/runtime/parrot/library/PCT.pbc
 PMC_DIR       = src/pmc
@@ -17,23 +24,14 @@ OPSLIB        = perl6
 OPS_FILE      = src/ops/perl6.ops
 
 # Set up extensions
-LOAD_EXT      = @load_ext@
-O             = @o@
-EXE           = @exe@
 
 # Setup some commands
-MAKE          = @make_c@
-PERL          = @perl@
-RM_F          = @rm_f@
 PARROT        = ../../parrot$(EXE)
 CAT           = $(PERL) -MExtUtils::Command -e cat
 BUILD_DYNPMC  = $(PERL) $(BUILD_DIR)/tools/build/dynpmc.pl
 BUILD_DYNOPS  = $(PERL) $(BUILD_DIR)/tools/build/dynoplibs.pl
 RECONFIGURE   = $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
 PBC_TO_EXE    = $(BUILD_DIR)/pbc_to_exe$(EXE)
-#CONDITIONED_LINE(darwin):
-#CONDITIONED_LINE(darwin):# MACOSX_DEPLOYMENT_TARGET must be defined for OS X compilation/linking
-#CONDITIONED_LINE(darwin):export MACOSX_DEPLOYMENT_TARGET := @osx_version@
 
 SOURCES = perl6.pir \
   src/gen_grammar.pir \