diff --git a/configure b/configure
index b874bbb01..1a273e8b9 100755
--- a/configure
+++ b/configure
@@ -24743,8 +24743,8 @@ mkdir ldns-src; cp $srcdir/ldns-src.tar.gz ldns-src/ldns-src.tar.gz; (cd ldns-sr
 ldnsdir=`ls -d ldns-src/ldns*`
 { echo "$as_me:$LINENO: Configure $ldnsdir" >&5
 echo "$as_me: Configure $ldnsdir" >&6;}
-echo "(cd $ldnsdir; ./configure)"
-(cd $ldnsdir; ./configure)
+echo "(cd $ldnsdir && ./configure)"
+(cd $ldnsdir && ./configure)
 { echo "$as_me:$LINENO: Finished $ldnsdir configure" >&5
 echo "$as_me: Finished $ldnsdir configure" >&6;}
 CPPFLAGS="$CPPFLAGS -I$ldnsdir/include"
diff --git a/configure.ac b/configure.ac
index 614097a5b..242e6ea66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -639,8 +639,8 @@ if test -d ldns-src; then rm -rf ldns-src; fi
 mkdir ldns-src; cp $srcdir/ldns-src.tar.gz ldns-src/ldns-src.tar.gz; (cd ldns-src; gzip -cd ldns-src.tar.gz | tar xf -); rm -f ldns-src/ldns-src.tar.gz
 ldnsdir=`ls -d ldns-src/ldns*`
 AC_MSG_NOTICE([Configure $ldnsdir])
-echo "(cd $ldnsdir; ./configure)"
-(cd $ldnsdir; ./configure)
+echo "(cd $ldnsdir && ./configure)"
+(cd $ldnsdir && ./configure)
 AC_MSG_NOTICE([Finished $ldnsdir configure])
 CPPFLAGS="$CPPFLAGS -I$ldnsdir/include"
 LDFLAGS="$LDFLAGS $ldnsdir/*.lo"
diff --git a/doc/Changelog b/doc/Changelog
index 5404c1351..b713171dc 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+12 February 2008: Wouter
+	- fixup problem with configure calling itself if ldns-src tarball
+	  is not present.
+
 11 February 2008: Wouter
 	- changed library to use ub_ instead of ub_val_ as prefix.
 	- statistics output text nice.