diff --git a/GNUmakefile b/GNUmakefile
index dd4ed74cac8e2b6157176e18f0d7f864ebc683ad..2ec4009f7b551780c589a1ebc9527c227299f278 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -28,7 +28,7 @@ all: moduleTest
 
 setup::
 	mkdir -p dist/tmp
-	$(HC) $(GHCFLAGS) -isrc -odir dist/tmp -hidir dist/tmp Setup -o setup
+	$(HC) $(GHCFLAGS) -i. -odir dist/tmp -hidir dist/tmp Setup.lhs -o setup
 
 Setup-nhc:
 	hmake -nhc98 -package base -prelude Setup
diff --git a/TODO b/TODO
index 6061d779036256180c77462c9c2b8272d5b17671..c6191779f8ce071826b675f4a2907900f8cee932 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,11 @@
 ------------------------------------------------------------
 -= 1.2 =-
 
+* Something for gentoo which produces a package gen file but doesn't
+  do the register??
+
+* Mine Brian Smith emails for tests & patches
+
 * MOVED FOR DARCS BUT NOT CVS.  Move Distribution and everything
   into a subdirectory, so we can build the Setup file with the normal
   invocation of cabal.