diff --git a/ChangeLog b/ChangeLog
index 2e75b0a5f..25161cc04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ ChangeLog - 2006-10-12
 
 
 Version 0.2.2 (under dev!):
+   * fixed iconv detection for BSD (patch #5456)
    * fixed typo in configure.in (bash specific test) (patch #5450)
    * mode changes with /op, /deop, /voice, /devoice, /halfop, /dehalfop are
      now sent in one mode command to server (task #5968)
diff --git a/configure.in b/configure.in
index 985d71fba..bcc7009b9 100644
--- a/configure.in
+++ b/configure.in
@@ -198,6 +198,9 @@ iconv_found="no"
 AC_CHECK_HEADER(iconv.h,ac_found_iconv_header="yes",ac_found_iconv_header="no")
 if test "x$ac_found_iconv_header" = "xyes" ; then
    AC_CHECK_LIB(iconv,iconv_open,ac_found_iconv_lib="yes",ac_found_iconv_lib="no")
+   if test "x$ac_found_iconv_lib" = "xno" ; then
+      AC_CHECK_LIB(iconv,libiconv_open,ac_found_iconv_lib="yes",ac_found_iconv_lib="no")
+   fi
    if test "x$ac_found_iconv_lib" = "xyes" ; then
       LIBS="$LIBS -liconv"
    fi
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 2e75b0a5f..25161cc04 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -5,6 +5,7 @@ ChangeLog - 2006-10-12
 
 
 Version 0.2.2 (under dev!):
+   * fixed iconv detection for BSD (patch #5456)
    * fixed typo in configure.in (bash specific test) (patch #5450)
    * mode changes with /op, /deop, /voice, /devoice, /halfop, /dehalfop are
      now sent in one mode command to server (task #5968)
diff --git a/weechat/configure.in b/weechat/configure.in
index 985d71fba..bcc7009b9 100644
--- a/weechat/configure.in
+++ b/weechat/configure.in
@@ -198,6 +198,9 @@ iconv_found="no"
 AC_CHECK_HEADER(iconv.h,ac_found_iconv_header="yes",ac_found_iconv_header="no")
 if test "x$ac_found_iconv_header" = "xyes" ; then
    AC_CHECK_LIB(iconv,iconv_open,ac_found_iconv_lib="yes",ac_found_iconv_lib="no")
+   if test "x$ac_found_iconv_lib" = "xno" ; then
+      AC_CHECK_LIB(iconv,libiconv_open,ac_found_iconv_lib="yes",ac_found_iconv_lib="no")
+   fi
    if test "x$ac_found_iconv_lib" = "xyes" ; then
       LIBS="$LIBS -liconv"
    fi