diff --git a/database/mysql/mysql.conf b/database/mysql/mysql.conf
index efdad6668..d7098f925 100644
--- a/database/mysql/mysql.conf
+++ b/database/mysql/mysql.conf
@@ -1,8 +1,9 @@
 #!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: package/.../mysql/mysql.conf
+# Filename: package/.../mysql/mysql.conf
+# Copyright (C) 2007 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 # 
@@ -12,11 +13,16 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License. A copy of the
 # GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
+# --- SDE-COPYRIGHT-NOTE-END ---
 
 var_append extraconfopt " " "--with-berkeley-db"
 var_append extraconfopt " " "--with-openssl"
 
+# enable thread support for the client library if available
+if [ "$SDECFG_PKG_GLIBC_TLS" == 1 ] ; then 
+	var_append extraconfopt " " "--enable-thread-safe-client"
+fi
+
 if [ $prefix_auto = 1 ] ; then
 	prefix="opt/mysql"
 	set_confopt