diff --git a/Makefile b/Makefile
index c09ba01e99178fce6aa49a9369cde45e7f3f4279..149a0c280fdb97ad59d57020c85611fde73221ed 100644
--- a/Makefile
+++ b/Makefile
@@ -194,7 +194,7 @@ else # boilerplate.mk exists
 
 include $(TOP)/mk/boilerplate.mk
 
-SUBDIRS = doc #cabal-setup
+SUBDIRS = doc cabal-setup
 
 ALL_DIRS = \
 	Distribution \
diff --git a/cabal-setup/Makefile b/cabal-setup/Makefile
index 7f725f1dc53fcda531da787aa42415105544f0ab..edaca1d566330dd2addd96a6839439eac66e0aab 100644
--- a/cabal-setup/Makefile
+++ b/cabal-setup/Makefile
@@ -14,7 +14,8 @@ HS_PROG 	= cabal-setup
 EXCLUDED_SRCS 	= Setup.hs
 SRC_HC_OPTS 	+= -package Cabal
 
-INSTALL_PROGS	+= $(HS_PROG)
+# Don't install this yet, it isn't ready
+# INSTALL_PROGS	+= $(HS_PROG)
 
 include $(TOP)/mk/target.mk