diff --git a/ChangeLog b/ChangeLog
index f6ce218050..d873e84dde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-15  Derek Atkins  <derek@ihtfp.com>
+
+	* acinclude.m4: re-add dependency on guile-config, but make it
+	  work without an error.
+	* configure.in: change the URL to g-wrap to something that exists
+
 2002-08-14  Chris Lyttle  <chris@wilddev.net>
 
 	* acinclude.m4: remove dependency on guile-config (David Hampton)
diff --git a/acinclude.m4 b/acinclude.m4
index 7b1d501929..c01adf3d62 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -123,43 +123,45 @@ max_guile_version=ifelse([$2], , 99.99.99,$2)
 
 AC_MSG_CHECKING(for guile - ${min_guile_version} <= version < ${max_guile_version})
 
-guile_version=`guile --version | head -1`
-guile_version="$guile_version.0"
-guile_major_version=`echo $guile_version | \
-	sed 's/.*Guile \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
-guile_minor_version=`echo $guile_version | \
-	sed 's/.*Guile \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
-guile_micro_version=`echo $guile_version | \
-	sed 's/.*Guile \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
-
-major_required=`echo ${min_guile_version} |\
+if test x${BUILD_GUILE} != x -a ${BUILD_GUILE} != no ; then
+  guile_version=`guile-config --version 2>&1`
+  guile_version="$guile_version.0"
+  guile_major_version=`echo $guile_version | \
+	sed 's/.*Guile version \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
+  guile_minor_version=`echo $guile_version | \
+	sed 's/.*Guile version \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
+  guile_micro_version=`echo $guile_version | \
+	sed 's/.*Guile version \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
+
+  major_required=`echo ${min_guile_version} |\
         sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-minor_required=`echo ${min_guile_version} |\
+  minor_required=`echo ${min_guile_version} |\
 	sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-micro_required=`echo ${min_guile_version} |\
+  micro_required=`echo ${min_guile_version} |\
 	sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
 
-major_prohibited=`echo ${max_guile_version} |\
+  major_prohibited=`echo ${max_guile_version} |\
         sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-minor_prohibited=`echo ${max_guile_version} |\
+  minor_prohibited=`echo ${max_guile_version} |\
 	sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-micro_prohibited=`echo ${max_guile_version} |\
+  micro_prohibited=`echo ${max_guile_version} |\
 	sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
 
 
-if ${GUILE} -c "(cond ((> ${guile_major_version} ${major_required}) (exit 0))\
+  if ${GUILE} -c "(cond ((> ${guile_major_version} ${major_required}) (exit 0))\
 	           ((< ${guile_major_version} ${major_required}) (exit 1))\
                    ((> ${guile_minor_version} ${minor_required}) (exit 0))\
 		   ((< ${guile_minor_version} ${minor_required}) (exit 1))\
 	           ((< ${guile_micro_version} ${micro_required}) (exit 1))\
 		   (else (exit 0)))" ; then
-  if ${GUILE} -c "(cond ((> ${guile_major_version} ${major_prohibited}) (exit 1))\
+    if ${GUILE} -c "(cond ((> ${guile_major_version} ${major_prohibited}) (exit 1))\
 	           ((< ${guile_major_version} ${major_prohibited}) (exit 0))\
                    ((> ${guile_minor_version} ${minor_prohibited}) (exit 1))\
 		   ((< ${guile_minor_version} ${minor_prohibited}) (exit 0))\
 	           ((< ${guile_micro_version} ${micro_prohibited}) (exit 0))\
 		   (else (exit 1)))" ; then
 	version_ok=yes
+    fi
   fi
 fi
 
diff --git a/configure.in b/configure.in
index e19e372649..8580f918e0 100644
--- a/configure.in
+++ b/configure.in
@@ -562,7 +562,7 @@ AM_PATH_GWRAP(1.1.11, 1.3.0, , [AC_MSG_ERROR([
   correct version range.  Right now gnucash requires at least version
   1.1.11 to build, but does not work with 1.3 or greater.
   If you need to install g-wrap, you can find it at
-  ftp://ftp.gnucash.org/pub/g-wrap.
+  http://www.gnucash.org/pub/g-wrap.
 ])])
 
 # Find out what the g-wrap compile and link flags are.