diff --git a/base/glibc/glibc.conf b/base/glibc/glibc.conf
index 0da7cc33f..776558a93 100644
--- a/base/glibc/glibc.conf
+++ b/base/glibc/glibc.conf
@@ -81,6 +81,11 @@ else
 		var_append extraconfopt " " "--without-tls"
 fi
 
+# ckeck whether to enable libidn support
+if [ $SDECFG_PKG_GLIBC_LIBIDN = 1 ]; then
+	var_append glibc_addons "," "libidn"
+fi
+
 var_append extraconfopt " " "--enable-add-ons=$glibc_addons"
 
 # control whether to include profiling support
diff --git a/base/glibc/subconfig-libc.in b/base/glibc/subconfig-libc.in
index 4f7219fa7..c8d33f406 100644
--- a/base/glibc/subconfig-libc.in
+++ b/base/glibc/subconfig-libc.in
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../glibc/subconfig-libc.in
-# Copyright (C) 2007 - 2010 The OpenSDE Project
+# Copyright (C) 2007 - 2011 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 #
@@ -23,6 +23,7 @@ comment 'Glibc (GNU C Library) Options'
     esac
 
     bool 'Enable TLS and NPTL' SDECFG_PKG_GLIBC_TLS $tls
+    bool 'Enable LibIDN' SDECFG_PKG_GLIBC_LIBIDN 1
     bool 'Enable profile library' SDECFG_PKG_GLIBC_ENABLE_PROFILE 0
 
 comment ' '