diff --git a/lang/tcl86/files/patch-unix-configure b/lang/tcl86/files/patch-unix-configure
index 2f596f9521a7..e413b7690636 100644
--- a/lang/tcl86/files/patch-unix-configure
+++ b/lang/tcl86/files/patch-unix-configure
@@ -1,41 +1,50 @@
 --- configure.orig	2007-12-19 22:50:13.000000000 +0100
 +++ configure	2007-12-26 11:49:03.000000000 +0100
 @@ -6633,7 +6633,7 @@
      LDFLAGS_ARCH=""
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
 -    TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
 +    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
      ECHO_VERSION='`echo ${VERSION}`'
      TCL_LIB_VERSIONS_OK=ok
      CFLAGS_DEBUG=-g
 @@ -7624,7 +7624,7 @@
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
 -	    LDFLAGS="$LDFLAGS -export-dynamic"
 +	    LDFLAGS=""
  	    if test $doRpath = yes; then
  
  		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 @@ -7635,16 +7635,16 @@
  
  		# The -pthread needs to go in the CFLAGS, not LIBS
  		LIBS=`echo $LIBS | sed s/-pthread//`
 -		CFLAGS="$CFLAGS -pthread"
 -	    	LDFLAGS="$LDFLAGS -pthread"
 +		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 +	    	LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
  
  fi
  
  	    case $system in
 -	    FreeBSD-3.*)
 +	    FreeBSD-*)
  	    	# FreeBSD-3 doesn't handle version numbers with dots.
  	    	UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 -	    	SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
 +	    	SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
  	    	TCL_LIB_VERSIONS_OK=nodots
  		;;
  	    esac
+@@ -7831,7 +7831,7 @@
+ 	    # This configuration from FreeBSD Ports.
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD="${CC} -shared"
+-	    TCL_SHLIB_LD_EXTRAS="-soname \$@"
++	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@"
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS=""
\ No newline at end of file