diff --git a/base/uclibc/subconfig-libc-300.in b/base/uclibc/subconfig-libc-300.in
index 78838a78e..6514fc427 100644
--- a/base/uclibc/subconfig-libc-300.in
+++ b/base/uclibc/subconfig-libc-300.in
@@ -3,6 +3,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../uclibc/subconfig-libc-300.in
+# Copyright (C) 2010 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -16,4 +17,14 @@
 # uclibc and glibc don't cohexist in our approach //mnemoc
 if [ "$SDECFG_LIBC" == "uclibc" ]; then
 	pkgremove glibc
+
+	comment 'uClibc options'
+
+	comment ' '
+
+	comment 'Thread support:'
+	choice SDECFG_PKG_UCLIBC_THREADSUPPORT old \
+		none "disable thread support" \
+		old "use older version of linuxthreads (stable)" \
+		new "use slightly newer version of linuxthreads (not much tested)"
 fi
diff --git a/base/uclibc/uclibc.conf b/base/uclibc/uclibc.conf
index f2de1c50c..f80f3157b 100644
--- a/base/uclibc/uclibc.conf
+++ b/base/uclibc/uclibc.conf
@@ -54,6 +54,18 @@ default_config() {
 		echo "O HAVE_SHARED"
 	fi
 
+	# thread support
+	if [ "$SDECFG_PKG_UCLIBC_THREADSUPPORT" != "none" ]; then
+		echo "X UCLIBC_HAS_THREADS"
+		# choose the thread implementation
+		case "$SDECFG_PKG_UCLIBC_THREADSUPPORT" in
+			old) echo "X LINUXTHREADS_OLD" ;;
+			new) echo "X LINUXTHREADS_NEW" ;;
+		esac
+	else
+		echo "X HAS_NO_THREADS"
+	fi
+
 	# locale
 	if [ "$SDECFG_DISABLE_NLS" = "0" ]; then
 		echo "X UCLIBC_HAS_LOCALE"