diff --git a/Docs/manual.texi b/Docs/manual.texi
index 45ace36a2553247c252aa70ea84a7053c9bd9688..48e5597489e644d34f6a5af7c448584c24103875 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -3574,11 +3574,14 @@ A license is required if:
 
 @itemize @minus
 @item
-You link a part of the of @strong{MySQL} that has a GPL Copyright to a
-program that is not free software (embedded usage of the @strong{MySQL}
-server).  In this case your application would also become GPL through the
-clause in the GPL license that acts as a virus.  By licensing @strong{MySQL} 
-from us under a commercial license you will avoid this problem.
+You link a program, that is not free software, with code from the
+@strong{MySQL} server or clients that has the GPL copyright. This
+happens for example when you use @strong{MySQL} as an embedded server
+in your applications or when you add not free extensions to the
+@strong{MySQL} server.  In this case your application/code would also
+become GPL through the GPL license that acts as a virus.  By licensing
+@strong{MySQL} server from @strong{MySQL AB} under a commercial
+license you will avoid this problem.
 
 @item
 You have a commercial application that ONLY works with @strong{MySQL}
diff --git a/configure.in b/configure.in
index 97452c527199811ff4bbf7b5314d2637fd7c0a20..20c419c7328ba55bc574ab59a9f2a335c3a4e47e 100644
--- a/configure.in
+++ b/configure.in
@@ -2056,7 +2056,7 @@ EOF
     then 
       MT_LD_ADD="$OVERRIDE_MT_LD_ADD"
     else
-      MT_LD_ADD="-L \$(top_srcdir)/mit-pthreads/obj/ -lpthread.a"
+      MT_LD_ADD="-L \$(top_srcdir)/mit-pthreads/obj/ -lpthread"
     fi
     AC_SUBST(MT_LD_ADD)
     echo ""