diff --git a/config/ac-macros/ssl.m4 b/config/ac-macros/ssl.m4
index 0f2f207c36f..4ee58318a62 100644
--- a/config/ac-macros/ssl.m4
+++ b/config/ac-macros/ssl.m4
@@ -28,10 +28,9 @@ AC_DEFUN([MYSQL_USE_BUNDLED_YASSL], [
   yassl_dir="yassl"
   AC_SUBST([yassl_dir])
 
-  yassl_libs="-L\$(top_srcdir)/extra/yassl/src -lyassl -L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt"
+  yassl_libs="\$(top_builddir)/extra/yassl/src/libyassl.la \
+              \$(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la"
   AC_SUBST(yassl_libs)
-  yassl_includes="-I\$(top_srcdir)/extra/yassl/include"
-  AC_SUBST(yassl_includes)
 
   AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for SSL.])
   AC_DEFINE([HAVE_YASSL], [1], [Defined by configure. Using yaSSL for SSL.])
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 7eb160776e0..cf4f90d99c9 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -94,8 +94,8 @@ INC_LIB=	$(top_builddir)/regex/libregex.a \
 		$(yassl_inc_libs)
 
 if HAVE_YASSL
-yassl_inc_libs=	$(top_srcdir)/extra/yassl/src/.libs/libyassl.a \
-		$(top_srcdir)/extra/yassl/taocrypt/src/.libs/libtaocrypt.a
+yassl_inc_libs=	$(top_builddir)/extra/yassl/src/.libs/libyassl.a \
+		$(top_builddir)/extra/yassl/taocrypt/src/.libs/libtaocrypt.a
 endif
 
 # Storage engine specific compilation options
diff --git a/storage/ndb/config/type_kernel.mk.am b/storage/ndb/config/type_kernel.mk.am
index 1b9d49d8088..c2a602d4e19 100644
--- a/storage/ndb/config/type_kernel.mk.am
+++ b/storage/ndb/config/type_kernel.mk.am
@@ -2,7 +2,7 @@
 INCLUDES += \
         -I$(srcdir) \
 	-I$(top_builddir)/include \
-	-I$(top_builddir)/ndb/include \
+	-I$(top_builddir)/storage/ndb/include \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/storage/ndb/include \
         -I$(top_srcdir)/storage/ndb/src/kernel/vm \
diff --git a/storage/ndb/config/type_ndbapi.mk.am b/storage/ndb/config/type_ndbapi.mk.am
index 9e1b83c0cad..258322d6d9a 100644
--- a/storage/ndb/config/type_ndbapi.mk.am
+++ b/storage/ndb/config/type_ndbapi.mk.am
@@ -2,7 +2,7 @@
 INCLUDES += \
         -I$(srcdir) \
 	-I$(top_builddir)/include \
-	-I$(top_builddir)/ndb/include \
+	-I$(top_builddir)/storage/ndb/include \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/mysys \
 	-I$(top_srcdir)/storage/ndb/include \
diff --git a/storage/ndb/config/type_ndbapitest.mk.am b/storage/ndb/config/type_ndbapitest.mk.am
index e385e7bc07e..9a5a7d5a778 100644
--- a/storage/ndb/config/type_ndbapitest.mk.am
+++ b/storage/ndb/config/type_ndbapitest.mk.am
@@ -7,7 +7,7 @@ LDADD += $(top_builddir)/storage/ndb/test/src/libNDBT.a \
 
 INCLUDES += -I$(top_srcdir) \
 	-I$(top_builddir)/include \
-	-I$(top_builddir)/ndb/include \
+	-I$(top_builddir)/storage/ndb/include \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/storage/ndb/include \
         -I$(top_srcdir)/storage/ndb/include/ndbapi \
diff --git a/storage/ndb/config/type_ndbapitools.mk.am b/storage/ndb/config/type_ndbapitools.mk.am
index 1bb8339a390..6003489f46e 100644
--- a/storage/ndb/config/type_ndbapitools.mk.am
+++ b/storage/ndb/config/type_ndbapitools.mk.am
@@ -7,7 +7,7 @@ LDADD += \
 
 INCLUDES += -I$(srcdir) \
 	-I$(top_builddir)/include \
-	-I$(top_builddir)/ndb/include \
+	-I$(top_builddir)/storage/ndb/include \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/storage/ndb/include \
         -I$(top_srcdir)/storage/ndb/include/ndbapi \
diff --git a/storage/ndb/config/type_util.mk.am b/storage/ndb/config/type_util.mk.am
index 02ce2cfc969..2ce75a2ce31 100644
--- a/storage/ndb/config/type_util.mk.am
+++ b/storage/ndb/config/type_util.mk.am
@@ -1,7 +1,7 @@
 
 INCLUDES += -I$(srcdir) \
 	-I$(top_builddir)/include \
-	-I$(top_builddir)/ndb/include \
+	-I$(top_builddir)/storage/ndb/include \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/mysys \
 	-I$(top_srcdir)/storage/ndb/include \