diff --git a/configure.ac b/configure.ac
index b6435ea..213b1dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,7 +87,13 @@ 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.
+dnl test ticket 151
+### LIBICONV=
+### ifdef(AM_ICONV, AM_ICONV, AC_CHECK_LIB(iconv, iconv, , ))
+### LIBS="$LIBS $LIBICONV"
 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/libisofs/libisofs.h b/libisofs/libisofs.h
index be4be9a..0e02f54 100644
--- a/libisofs/libisofs.h
+++ b/libisofs/libisofs.h
@@ -4412,7 +4412,7 @@ int iso_node_get_attrs(IsoNode *node, size_t *num_attrs,
  * @param flag
  *      Bitfield for control purposes, unused yet, submit 0
  * @return
- *      1= name found , 0= name not found , <0 indicates error error
+ *      1= name found , 0= name not found , <0 indicates error
  *
  * @since 0.6.18
  */
diff --git a/libisofs/make_isohybrid_mbr.c b/libisofs/make_isohybrid_mbr.c
index a30edf7..7d98e9e 100644
--- a/libisofs/make_isohybrid_mbr.c
+++ b/libisofs/make_isohybrid_mbr.c
@@ -25,12 +25,13 @@ and is now under the licenses to which H.Peter Anvin agreed:
  or both, at your option.
  Sincerely, H. Peter Anvin
 
-In the context of libisofs this code derives its matching open source
+In the context of xorriso-standalone, this code is under GPLv2 derived from
+LGPL. In the context of libisofs this code derives its matching open source
 license from above stem licenses, typically from LGPL.
 In case its generosity is needed, here is the 2-clause BSD license:
 
 make_isohybrid_mbr.c is copyright 2002-2008 H. Peter Anvin
-                              and 2008 libburnia project.
+                              and 2008-2009 libburnia project.
 
 1. Redistributions of source code must retain the above copyright notice,
    this list of conditions and the following disclaimer.