diff --git a/configure.ac b/configure.ac
index b8ba206..ecddb01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,9 +221,9 @@ AM_CONDITIONAL(FAKE_GLIB, test "x$enable_glib" != "xyes")
 
 dnl Set up substitution variables
 if test "$am_cv_func_iconv" = "yes"; then
-    HAVE_ICONV=1
+    HAVE_ICONV_H=1
 fi
-AC_SUBST(HAVE_ICONV)
+AC_SUBST(HAVE_ICONV_H)
 
 if test "$ac_cv_header_xlocale_h" = "yes"; then
     HAVE_XLOCALE_H=1
@@ -309,6 +309,8 @@ if test x$HAVE_ODBC = xtrue; then summary=${bold_green}enabled; else summary=${b
 AC_MSG_NOTICE([   ODBC            : ${summary}${reset}])
 if test x$enable_glib = xyes; then summary=${bold_green}enabled; else summary=${bold_red}disabled; fi
 AC_MSG_NOTICE([   GLib            : ${summary}${reset}])
+if test x$am_cv_func_iconv = xyes; then summary=${bold_green}enabled; else summary=${bold_red}disabled; fi
+AC_MSG_NOTICE([   iconv           : ${summary}${reset}])
 if test x$enable_man = xyes; then summary=${bold_green}enabled; else summary=${bold_red}disabled; fi
 AC_MSG_NOTICE([   man pages       : ${summary}${reset}])
 if test "x$with_bash_completion_dir" != "xno"; then summary=${bold_green}enabled; else summary=${bold_red}disabled; fi
diff --git a/include/mdbtools.h.in b/include/mdbtools.h.in
index b53b5fd..9f7f518 100644
--- a/include/mdbtools.h.in
+++ b/include/mdbtools.h.in
@@ -18,7 +18,7 @@
 #ifndef _mdbtools_h_
 #define _mdbtools_h_
 
-#define MDBTOOLS_H_HAVE_ICONV @HAVE_ICONV@
+#define MDBTOOLS_H_HAVE_ICONV_H @HAVE_ICONV_H@
 #define MDBTOOLS_H_HAVE_XLOCALE_H @HAVE_XLOCALE_H@
 
 #ifdef __cplusplus
@@ -36,7 +36,7 @@
 #include <locale.h>
 #include <@GLIB_INCLUDE_HEADER@>
 
-#if MDBTOOLS_H_HAVE_ICONV
+#if MDBTOOLS_H_HAVE_ICONV_H
 #include <iconv.h>
 #elif MDBTOOLS_H_HAVE_XLOCALE_H
 #include <xlocale.h>
@@ -308,7 +308,7 @@ typedef struct {
 	char        *relationships_values[5];
 	MdbStatistics *stats;
     GHashTable *backends;
-#if MDBTOOLS_H_HAVE_ICONV
+#if MDBTOOLS_H_HAVE_ICONV_H
 	iconv_t iconv_in;
 	iconv_t iconv_out;
 #elif defined(_WIN32) || defined(WIN32) || defined(_WIN64) || defined(WIN64) || defined(WINDOWS)