diff --git a/configure.ac b/configure.ac
index d9de7961..f415439c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,6 +74,8 @@ fi
 dnl If iconv(3) is in an extra lib, then it gets added to variable LIBS.
 dnl If not, then no -liconv will be added.
 AC_CHECK_LIB(iconv, iconv, , )
+dnl GNU iconv has no function iconv() but libiconv() and a macro iconv()
+AC_CHECK_LIB(iconv, libiconv, , )
 
 AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
diff --git a/xorriso/configure_ac.txt b/xorriso/configure_ac.txt
index 5f05fedc..1291dfc0 100644
--- a/xorriso/configure_ac.txt
+++ b/xorriso/configure_ac.txt
@@ -46,7 +46,9 @@ fi
 dnl If iconv(3) is in an extra libiconv, then it gets added to variable LIBS.
 dnl If not, then no -liconv will be added.
 AC_CHECK_LIB(iconv, iconv, , )
-
+dnl GNU iconv has no function iconv() but libiconv() and a macro iconv()
+AC_CHECK_LIB(iconv, libiconv, , )
+ 
 AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 LIBTOOL="$LIBTOOL --silent"
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index b3a5a5a4..34e45d2f 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2009.06.28.100124"
+#define Xorriso_timestamP "2009.06.30.120311"