diff --git a/mk/config.mk.in b/mk/config.mk.in
index f616629d4a457e531af1bfd9026199175e7dad2c..bed43c98a185a878f4ab7818a6339d3352e652e8 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -506,7 +506,7 @@ HBC		= @HBC@
 NHC		= @NHC@
 
 HC	        = @WithHc@
-MKDEPENDHS	= $(GHC)
+MKDEPENDHS	= $(HC)
 
 # Sometimes we want to invoke ghc from the build tree in different
 # projects (eg. it's handy to have a nofib & a ghc build in the same
@@ -720,6 +720,7 @@ HSTAGS			= $(HSTAGS_PREFIX)hstags
 # The ways currently defined.
 #
 ALL_WAYS=p t u s mp mg a b c d e f g h i j k l m n o A B
+USER_WAYS=a b c d e f g h i j k l m n o A B
 
 #
 # The following ways currently have treated specially, p u t mg,