diff --git a/GNUmakefile b/GNUmakefile
index 7a522965196134a93a6a782b67080f6693a76b84..a54cdc7ce60d5310dc77d33d4a383d0ed052c1ac 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -72,6 +72,7 @@ clean-cabal:
 	-rm -f Distribution/*.o Distribution/*.hi
 	-rm -f Distribution/Simple/*.o Distribution/Simple/*.hi
 	-rm -f Compat/*.o Compat/*.hi
+	-rm -f darcs* out.build *~ semantic.cache* x*.html
 	-rm -f library-infrastructure--darcs.tar.gz
 	-rm -rf setup *.o *.hi moduleTest dist installed-pkg-config
 	-rm -f build-stamp
diff --git a/TODO b/TODO
index 9cf18045b3d9067cbeefb3560994341d767b7a0b..ca3ad92fad934d4b904e6074c9dcc428bc875cfb 100644
--- a/TODO
+++ b/TODO
@@ -24,6 +24,9 @@ helpful.
 
 I hope this can sneak into the Cabal release, but don't worry if not.
 
+* add a haskell-version field?
+* ignore unknown fields? (--force?)
+
 -= 1.0 =-
 
 * Install libraries in $libdir/ghc-$ghc_version/ rather than $libdir.