diff --git a/build/vars.build.mk b/build/vars.build.mk
index 902ef3b22..4e96aa9fd 100644
--- a/build/vars.build.mk
+++ b/build/vars.build.mk
@@ -9,7 +9,7 @@ AM_CFLAGS = \
 	$(GEANY_CFLAGS) \
 	$(GP_CFLAGS)
 
-AM_LDFLAGS = -module -avoid-version $(GP_LDFLAGS)
+AM_LDFLAGS = -module -avoid-version -no-undefined $(GP_LDFLAGS)
 
 COMMONLIBS = \
 	$(GEANY_LIBS) \
diff --git a/build/wafutils.py b/build/wafutils.py
index 5cd344fba..51708e46b 100644
--- a/build/wafutils.py
+++ b/build/wafutils.py
@@ -122,7 +122,7 @@ def build_plugin(ctx, name, plugin_name=None, sources=None, includes=None, defin
         defines       = defines,
         target        = plugin_name,
         use           = libraries,
-        install_path  = '${G_PREFIX}/${LIBDIR}' if is_win32 else '${LIBDIR}/geany/')
+        install_path  = '${G_PREFIX}/${LIBDIR}/geany/' if is_win32 else '${LIBDIR}/geany/')
 
     install_docs(ctx, plugin_name, 'AUTHORS ChangeLog COPYING NEWS README THANKS TODO'.split())
     return task