diff --git a/bootstrap b/bootstrap
index 78dd8affaa..ed62199741 100755
--- a/bootstrap
+++ b/bootstrap
@@ -207,6 +207,23 @@ libvlcdir = \$(libdir)/vlc/\$(basedir)
 EXTRA_LIBRARIES = ${extra_libs}
 include Modules.am
 
+if BUILD_SHARED
+if BUILD_PIC
+LIBVLC = \$(top_builddir)/libvlc_pic\$(LIBEXT)
+else
+LIBVLC = \$(top_builddir)/libvlc\$(LIBEXT)
+endif
+if HAVE_WIN32
+LIBADD = \$(LIBVLC)
+endif
+if HAVE_WINCE
+LIBADD = \$(LIBVLC)
+endif
+if HAVE_DARWIN
+LIBADD = \$(LIBVLC)
+endif
+endif
+
 all: all-modules
 
 # Find out which modules were enabled and tell make to build them
@@ -221,7 +238,7 @@ all-modules:
 # Build a plugin with the adequate linker and linker's flags
 _plugin.a_plugin\$(LIBEXT):
 	@mod="\$*" ; mod=\$\${mod#lib} ; \
-	ldfl="\`\$(VLC_CONFIG) --libs plugin \$\$mod\` -u \$(SYMPREF)\$(VLC_ENTRY)" ; \
+	ldfl="\`\$(VLC_CONFIG) --libs plugin \$\$mod\` \$(LIBADD) -u \$(SYMPREF)\$(VLC_ENTRY)" ; \
 	case \`\$(VLC_CONFIG) --linkage \$\$mod\` in \\
 	  c++)  ld="\$(CXXLINK)" ;; \
 	  objc) ld="\$(OBJCLINK)" ;; \