diff --git a/configure b/configure
index fc0a44def..a823b0b2c 100755
--- a/configure
+++ b/configure
@@ -3540,7 +3540,7 @@ eval "cv_prog_cc_flag_$cache=yes"
 else
 eval "cv_prog_cc_flag_$cache=no"
 fi
-rm -f conftest*
+rm -f conftest conftest.o conftest.c
 
 fi
 
@@ -3571,7 +3571,7 @@ eval "cv_prog_cc_flag_$cache=yes"
 else
 eval "cv_prog_cc_flag_$cache=no"
 fi
-rm -f conftest*
+rm -f conftest conftest.o conftest.c
 
 fi
 
@@ -3621,7 +3621,7 @@ eval "cv_prog_cc_flag_$cache=yes"
 else
 eval "cv_prog_cc_flag_$cache=no"
 fi
-rm -f conftest*
+rm -f conftest conftest.o conftest.c
 
 fi
 
@@ -3652,7 +3652,7 @@ eval "cv_prog_cc_flag_$cache=yes"
 else
 eval "cv_prog_cc_flag_$cache=no"
 fi
-rm -f conftest*
+rm -f conftest conftest.o conftest.c
 
 fi
 
@@ -4050,7 +4050,7 @@ eval "cv_prog_cc_flag_$cache=yes"
 else
 eval "cv_prog_cc_flag_$cache=no"
 fi
-rm -f conftest*
+rm -f conftest conftest.o conftest.c
 
 fi
 
@@ -4081,7 +4081,7 @@ eval "cv_prog_cc_flag_$cache=yes"
 else
 eval "cv_prog_cc_flag_$cache=no"
 fi
-rm -f conftest*
+rm -f conftest conftest.o conftest.c
 
 fi
 
@@ -4158,7 +4158,7 @@ eval "cv_prog_cc_flag_needed_$cache=fail"
 fi
 
 fi
-rm -f conftest
+rm -f conftest conftest.c conftest.o
 
 fi
 
@@ -4247,7 +4247,7 @@ eval "cv_prog_cc_flag_needed_$cache=fail"
 fi
 
 fi
-rm -f conftest
+rm -f conftest conftest.c conftest.o
 
 fi
 
@@ -4311,7 +4311,7 @@ eval "cv_prog_cc_flag_needed_$cache=fail"
 fi
 
 fi
-rm -f conftest
+rm -f conftest conftest.c conftest.o
 
 fi
 
@@ -4376,7 +4376,7 @@ eval "cv_prog_cc_flag_needed_$cache=fail"
 fi
 
 fi
-rm -f conftest
+rm -f conftest conftest.c conftest.o
 
 fi
 
@@ -4441,7 +4441,7 @@ eval "cv_prog_cc_flag_needed_$cache=fail"
 fi
 
 fi
-rm -f conftest
+rm -f conftest conftest.c conftest.o
 
 fi
 
@@ -4509,7 +4509,7 @@ eval "cv_prog_cc_flag_needed_$cache=fail"
 fi
 
 fi
-rm -f conftest
+rm -f conftest conftest.c conftest.o
 
 fi
 
@@ -4583,7 +4583,7 @@ eval "cv_prog_cc_flag_needed_$cache=fail"
 fi
 
 fi
-rm -f conftest
+rm -f conftest conftest.c conftest.o
 
 fi
 
@@ -4663,7 +4663,7 @@ eval "cv_prog_cc_flag_needed_$cache=fail"
 fi
 
 fi
-rm -f conftest
+rm -f conftest conftest.c conftest.o
 
 fi
 
@@ -4708,7 +4708,7 @@ eval "cv_prog_cc_flag_$cache=yes"
 else
 eval "cv_prog_cc_flag_$cache=no"
 fi
-rm -f conftest*
+rm -f conftest conftest.o conftest.c
 
 fi
 
@@ -4739,7 +4739,7 @@ eval "cv_prog_cc_flag_$cache=yes"
 else
 eval "cv_prog_cc_flag_$cache=no"
 fi
-rm -f conftest*
+rm -f conftest conftest.o conftest.c
 
 fi
 
@@ -4780,7 +4780,7 @@ eval "cv_prog_cc_flag_$cache=yes"
 else
 eval "cv_prog_cc_flag_$cache=no"
 fi
-rm -f conftest*
+rm -f conftest conftest.o conftest.c
 
 fi
 
@@ -4811,7 +4811,7 @@ eval "cv_prog_cc_flag_$cache=yes"
 else
 eval "cv_prog_cc_flag_$cache=no"
 fi
-rm -f conftest*
+rm -f conftest conftest.o conftest.c
 
 fi
 
@@ -4842,7 +4842,7 @@ eval "cv_prog_cc_flag_$cache=yes"
 else
 eval "cv_prog_cc_flag_$cache=no"
 fi
-rm -f conftest*
+rm -f conftest conftest.o conftest.c
 
 fi
 
@@ -4873,7 +4873,7 @@ eval "cv_prog_cc_flag_$cache=yes"
 else
 eval "cv_prog_cc_flag_$cache=no"
 fi
-rm -f conftest*
+rm -f conftest conftest.o conftest.c
 
 fi
 
@@ -22551,7 +22551,7 @@ eval "cv_prog_cc_flag_$cache=yes"
 else
 eval "cv_prog_cc_flag_$cache=no"
 fi
-rm -f conftest*
+rm -f conftest conftest.o conftest.c
 
 fi
 
@@ -25101,7 +25101,7 @@ eval "cv_prog_cc_flag_needed_$cache=fail"
 fi
 
 fi
-rm -f conftest
+rm -f conftest conftest.c conftest.o
 
 fi
 
diff --git a/configure.ac b/configure.ac
index 723bfe4fb..bd000bc3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,7 +110,7 @@ eval "cv_prog_cc_flag_$cache=yes"
 else
 eval "cv_prog_cc_flag_$cache=no"
 fi
-rm -f conftest*
+rm -f conftest conftest.o conftest.c
 ])
 if eval "test \"`echo '$cv_prog_cc_flag_'$cache`\" = yes"; then
 AC_MSG_RESULT(yes)
@@ -161,7 +161,7 @@ eval "cv_prog_cc_flag_needed_$cache=fail"
 fi
 ]
 fi
-rm -f conftest
+rm -f conftest conftest.c conftest.o
 ])
 if eval "test \"`echo '$cv_prog_cc_flag_needed_'$cache`\" = yes"; then
 AC_MSG_RESULT(yes)
diff --git a/doc/Changelog b/doc/Changelog
index 1e12c6044..483ecee2a 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -7,6 +7,8 @@
 	  routine managed to acquire the lock, so a caller may get the
 	  result at the same time they call cancel.  For this case, 
 	  ub_cancel tries to return an error code.
+	  Fixes race condition in ub_cancel() libunbound function.
+	- MacOSX Leopard cleaner text output from configure.
 
 4 February 2009: Wouter
 	- tag for release 1.2.1.