diff --git a/configure b/configure
index 887cdf648c..adab75786f 100755
--- a/configure
+++ b/configure
@@ -538,6 +538,7 @@ _ggilib=
 _xvlib=
 _x11lib=
 _xineramalib=
+_iconvlib=
 
 _select='#define HAVE_AUDIO_SELECT'
 
@@ -937,8 +938,13 @@ main()
 
 EOF
 _iconv=yes
+if [ "$system_name" = "FreeBSD" ]; then
+$_cc $_extraincdir $TMPC -o $TMPO $_extralibdir -lm -liconv > /dev/null 2>&1 || \
+ { _iconv=no ; echo "iconv(3) function not detected!" ;}
+else
 $_cc $TMPC -o $TMPO -lm > /dev/null 2>&1 || \
  { _iconv=no ; echo "iconv(3) function not detected!" ;}
+fi
 cat > $TMPC << EOF
 #include <GL/gl.h>
 int main( void ) { return 0; }
@@ -1994,6 +2000,11 @@ if [ "$system_name" = "FreeBSD" ]; then
 CFLAGS="$CFLAGS -D_THREAD_SAFE"
 fi
 
+if [ "$system_name" = "FreeBSD" ] && [ "$_iconv" = "#define USE_ICONV" ]; then
+_iconvlib="-liconv"
+fi
+
+
 # 64 bit file offsets?
 if [ "$_largefiles" = "yes" -o "$system_name" = "FreeBSD" ]; then
 CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
@@ -2231,6 +2242,8 @@ cat > $MCONF << EOF
 
 # -------- Generated by ./configure -----------
 
+LANG=C
+
 prefix = $_prefix
 AR=ar
 CC=$_cc
@@ -2258,7 +2271,7 @@ AV_DEP = $_lavcdep
 AV_LIB = $_lavclib
 ALSA_LIB = $_alsalib
 ESD_LIB = $_esdlib
-ARCH_LIBS = $_archlibs
+ARCH_LIBS = $_archlibs $_iconvlib
 STREAM_SRCS = $_streamingsrcs
 DECORE_LIBS = $_decorelibs
 DIVX4LINUX=$_divx4linux