diff --git a/ChangeLog b/ChangeLog
index d70fc3cb3f..c6ab649a62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-07-09  Dave Peticolas  <dave@krondo.com>
+
+	* src/Makefile.am: link intl libs with gnucash-make-guids
+
+	* src/register/QuickFill.c: same as below
+
+	* src/register/quickfillcell.c: conditionally include wctype.h
+
+	* configure.in: check for wctype.h
+
 2001-07-07  Dave Peticolas  <dave@krondo.com>
 
 	* src/test/gnc-test-stuff.c (get_random_query): not so many terms
diff --git a/configure.in b/configure.in
index 7e15a944ee..99c41df9f9 100644
--- a/configure.in
+++ b/configure.in
@@ -55,7 +55,7 @@ then
   AC_MSG_ERROR([Cannot find glib. Check config.log])
 fi
 
-AC_CHECK_HEADERS(dlfcn.h dl.h utmp.h locale.h mcheck.h unistd.h)
+AC_CHECK_HEADERS(dlfcn.h dl.h utmp.h locale.h mcheck.h unistd.h wctype.h)
 
 DL_LIB=
 AC_CHECK_FUNCS(dlopen,,[
diff --git a/src/Makefile.am b/src/Makefile.am
index a4e6a7d83c..efd11735e6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,7 +57,8 @@ gnucash_make_guids_LDADD = \
   engine/libgncengine.la \
   ${DL_LIB} \
   ${GNOME_XML_LIB} \
-  ${GLIB_LIBS}
+  ${GLIB_LIBS} \
+  ${INTLLIBS}
 
 gnucash_make_guids_SOURCES = \
   gnucash-make-guids.c
diff --git a/src/register/QuickFill.c b/src/register/QuickFill.c
index 1e39228cb8..e29a21a29b 100644
--- a/src/register/QuickFill.c
+++ b/src/register/QuickFill.c
@@ -27,7 +27,10 @@
 
 #include <ctype.h>
 #include <string.h>
+
+#ifdef HAVE_WCTYPE_H
 #include <wctype.h>
+#endif
 
 #include "QuickFill.h"
 #include "basiccell.h"
diff --git a/src/register/quickfillcell.c b/src/register/quickfillcell.c
index 646d452082..a3f3537826 100644
--- a/src/register/quickfillcell.c
+++ b/src/register/quickfillcell.c
@@ -40,7 +40,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
+#ifdef HAVE_WCTYPE_H
 #include <wctype.h>
+#endif
 
 #include "basiccell.h"
 #include "gnc-ui-util.h"