diff --git a/Makefile b/Makefile
index 6126d3d176e5a18fe6b2e06ce6cfc1a25f9293cc..b4a6bbc8a28f4b32e1ad2c1832d11133603f75c7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.143 2004/05/01 14:47:46 mast Exp $
+# $Id: Makefile,v 1.144 2004/05/17 21:38:45 mast Exp $
 #
 # Meta Makefile
 #
@@ -50,7 +50,11 @@ force_autoconfig:
 	cd src && ./run_autoconfig . 2>&1 | grep -v warning
 
 force_configure:
-	-rm -f "$(BUILDDIR)/Makefile"
+	-builddir="$(BUILDDIR)"; rm -f "$$builddir/Makefile"
+	@$(DO_MAKE) configure
+
+reconfigure:
+	-builddir="$(BUILDDIR)"; rm -f "$$builddir/Makefile" "$$builddir/config.cache"
 	@$(DO_MAKE) configure
 
 configure_help: src/configure
diff --git a/README-CVS b/README-CVS
index 1a846cd665d103f810f79f302e9dcb945283a9c3..69e1006c94c4e86a6c28ae4e5a6e7f27089b3f46 100644
--- a/README-CVS
+++ b/README-CVS
@@ -1,4 +1,4 @@
-$Id: README-CVS,v 1.23 2003/11/05 02:15:55 nilsson Exp $
+$Id: README-CVS,v 1.24 2004/05/17 21:38:45 mast Exp $
 
 
 HOW TO BUILD PIKE FROM CVS
@@ -69,12 +69,11 @@ source              Prepare the source tree for compilation without
 force_autoconfig    Force a build of the configure scripts.  This is
                     useful e.g. if a new module directory is added in
                     the CVS.
-force_configure     Force configure to be run (recursively).  If
-                    you've installed a new library and want Pike to
-                    detect it, then the simplest way is to remove
-                    config.cache in the build directory (or perhaps
-                    just delete the relevant variables in it) and then
-                    use this target.
+force_configure     Force configure to be run (recursively).
+reconfigure         Remove the cached results from previous configure
+                    runs and rerun configure recursively. If you've
+                    installed a new library and want Pike to detect it
+                    then the simplest way is to use this target.
 dump_modules        Dump the Pike modules directly in the build tree.
                     That makes Pike load faster if it's run directly
                     from there, e.g. through the bin/pike script (see