diff --git a/ChangeLog b/ChangeLog
index 7709af5cb4..feb654d9de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
 
 	* src/gnome/gnc-split-reg.c:  add a handler for
 	  exchange-rate menu items..  Partial fix for #100285
+
+	* README: fix references to g-wrap
+	* acinclude.m4: fix g-wrap test to fail properly if it cannot
+	  find g-wrap-config
 	
 2002-12-03  Derek Atkins  <derek@ihtfp.com>
 
diff --git a/README b/README
index 61fa06e7cb..6b05df2454 100644
--- a/README
+++ b/README
@@ -270,7 +270,7 @@ following packages:
   libxml: available from ftp.gnome.org
 
   g-wrap: RPM's, debs, and source available at 
-          ftp://ftp.gnucash.org/pub/g-wrap.
+          http://www.gnucash.org/pub/g-wrap.
           You should use g-wrap 1.3.2 or later.
 
   texinfo: If you are building from CVS, you need the GNU texinfo
@@ -382,7 +382,7 @@ IBM AIX 4.1.5         -- RS/6000   http://www-frec.bull.com/
 Unixware 7            -- Intel
 SCO OpenServer 5.0.4  -- Intel
 
-See ftp://ftp.gnucash.org/pub/xacc (high-bandwidth)
+See http://www.gnucash.org/pub/gnucash (high-bandwidth)
 or  http://linas.org/linux/gnucash (slow-www ) 
 for precompiled (but *very old*) binaries for these platforms
 
diff --git a/acinclude.m4 b/acinclude.m4
index 14aea674d1..10aa8dc946 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -3957,6 +3957,8 @@ if test x${GUILE} = x ; then
    AC_PATH_PROG(GUILE, guile, no)
 fi
 
+CHECK_VERSION=yes
+
 dnl if prefix set, then set them explicitly
 if test x${gwrap_prefix} != x ; then
    G_WRAP_CONFIG=${gwrap_prefix}/bin/g-wrap-config
@@ -3964,9 +3966,9 @@ else
 
   AC_PATH_PROG(G_WRAP_CONFIG, g-wrap-config, no)
   if test x${G_WRAP_CONFIG} = xno ; then
-	CHECK_VERSION="no"
-	ifelse([$3], , true , [AC_MSG_WARN(g-wrap-config failed)
-	$3])
+	CHECK_VERSION=no
+	ifelse([$4], , true , [AC_MSG_WARN(g-wrap-config failed)
+	$4])
   fi
 fi