diff --git a/addons/src/Makefile.am b/addons/src/Makefile.am
index c8a8f51a6..da9b1de55 100644
--- a/addons/src/Makefile.am
+++ b/addons/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = addons
 
 geanyplugins_LTLIBRARIES = addons.la
 
diff --git a/autoclose/src/Makefile.am b/autoclose/src/Makefile.am
index 7c7e97672..f98417c6f 100644
--- a/autoclose/src/Makefile.am
+++ b/autoclose/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = autoclose
 
 geanyplugins_LTLIBRARIES = autoclose.la
 
diff --git a/automark/src/Makefile.am b/automark/src/Makefile.am
index d7000b537..58b6746d8 100644
--- a/automark/src/Makefile.am
+++ b/automark/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = automark
 
 geanyplugins_LTLIBRARIES = automark.la
 
diff --git a/build/vars.build.mk b/build/vars.build.mk
index c759c646e..662d2699c 100644
--- a/build/vars.build.mk
+++ b/build/vars.build.mk
@@ -4,9 +4,12 @@ LOCAL_AM_CFLAGS = \
 	-DPREFIX=\"\" \
 	-DDOCDIR=\"\" \
 	-DGEANYPLUGINS_DATADIR=\"share\" \
-	-DPKGDATADIR=\""share/geany-plugins"\" \
+	-DPKGDATADIR=\""share/$(PACKAGE)"\" \
 	-DLIBDIR=\""lib"\" \
-	-DPKGLIBDIR=\"\"
+	-DPKGLIBDIR=\""lib/$(PACKAGE)\"" \
+	-DPLUGINDATADIR=\""share/$(PACKAGE)/$(plugin)"\" \
+	-DPLUGINDOCDIR=\""$(plugin)"\" \
+	-DPLUGINLIBDIR=\""lib/$(PACKAGE)/$(plugin)"\"
 else
 LOCAL_AM_CFLAGS = \
 	-DLOCALEDIR=\""$(LOCALEDIR)"\" \
@@ -15,11 +18,15 @@ LOCAL_AM_CFLAGS = \
 	-DGEANYPLUGINS_DATADIR=\""$(datadir)"\" \
 	-DPKGDATADIR=\""$(pkgdatadir)"\" \
 	-DLIBDIR=\""$(libdir)"\" \
-	-DPKGLIBDIR=\""$(pkglibdir)"\"
+	-DPKGLIBDIR=\""$(pkglibdir)"\" \
+	-DPLUGINDATADIR=\""$(pkgdatadir)/$(plugin)"\" \
+	-DPLUGINDOCDIR=\""$(docdir)/$(plugin)"\" \
+	-DPLUGINLIBDIR=\""$(pkglibdir)/$(plugin)"\"
 endif
 
 AM_CFLAGS = \
 	${LOCAL_AM_CFLAGS} \
+	-DPLUGIN="\"$(plugin)\"" \
 	$(GEANY_CFLAGS) \
 	$(GP_CFLAGS)
 	
diff --git a/codenav/src/Makefile.am b/codenav/src/Makefile.am
index 53818a3be..2f1ffa22c 100644
--- a/codenav/src/Makefile.am
+++ b/codenav/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = codenav
 
 geanyplugins_LTLIBRARIES = codenav.la
 
diff --git a/commander/src/Makefile.am b/commander/src/Makefile.am
index 461ac126a..b7e6b3b6e 100644
--- a/commander/src/Makefile.am
+++ b/commander/src/Makefile.am
@@ -6,7 +6,6 @@ geanyplugins_LTLIBRARIES = commander.la
 
 commander_la_SOURCES  = commander-plugin.c
 commander_la_CPPFLAGS = $(AM_CPPFLAGS) \
-                        -DPLUGIN=\"$(plugin)\" \
                         -DG_LOG_DOMAIN=\"Commander\"
 commander_la_CFLAGS   = $(AM_CFLAGS) \
                         $(COMMANDER_CFLAGS)
diff --git a/defineformat/src/Makefile.am b/defineformat/src/Makefile.am
index 3cd34e421..354166800 100644
--- a/defineformat/src/Makefile.am
+++ b/defineformat/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = defineformat
 
 geanyplugins_LTLIBRARIES = defineformat.la
 
diff --git a/geanyctags/src/Makefile.am b/geanyctags/src/Makefile.am
index 2b58e3b63..ffd38a8c2 100644
--- a/geanyctags/src/Makefile.am
+++ b/geanyctags/src/Makefile.am
@@ -9,7 +9,6 @@ geanyctags_la_SOURCES = \
 	readtags.c
 
 geanyctags_la_CPPFLAGS = $(AM_CPPFLAGS) \
-	-DPLUGIN=\"$(plugin)\" \
 	-DG_LOG_DOMAIN=\"GeanyCtags\"
 geanyctags_la_CFLAGS = $(AM_CFLAGS)
 geanyctags_la_LIBADD = $(COMMONLIBS)
diff --git a/geanydoc/src/Makefile.am b/geanydoc/src/Makefile.am
index aac73bf97..152361a71 100644
--- a/geanydoc/src/Makefile.am
+++ b/geanydoc/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanydoc
 
 geanyplugins_LTLIBRARIES = geanydoc.la
 
diff --git a/geanydoc/tests/Makefile.am b/geanydoc/tests/Makefile.am
index 7be684890..46c5cb572 100644
--- a/geanydoc/tests/Makefile.am
+++ b/geanydoc/tests/Makefile.am
@@ -1,5 +1,6 @@
 if UNITTESTS
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanydoc
 TESTS=unittests
 noinst_PROGRAMS=unittests
 unittests_SOURCES = unittests.c
diff --git a/geanyextrasel/src/Makefile.am b/geanyextrasel/src/Makefile.am
index 5fc72d2b2..87c092686 100644
--- a/geanyextrasel/src/Makefile.am
+++ b/geanyextrasel/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanyextrasel
 
 geanyplugins_LTLIBRARIES = geanyextrasel.la
 
diff --git a/geanyinsertnum/src/Makefile.am b/geanyinsertnum/src/Makefile.am
index 0121bbc93..b2c309cc5 100644
--- a/geanyinsertnum/src/Makefile.am
+++ b/geanyinsertnum/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanyinsertnum
 
 geanyplugins_LTLIBRARIES = geanyinsertnum.la
 
diff --git a/geanylatex/src/Makefile.am b/geanylatex/src/Makefile.am
index 04620c550..4919237fe 100644
--- a/geanylatex/src/Makefile.am
+++ b/geanylatex/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanylatex
 
 geanyplugins_LTLIBRARIES = geanylatex.la
 
diff --git a/geanylipsum/src/Makefile.am b/geanylipsum/src/Makefile.am
index c15618288..4e733a5ff 100644
--- a/geanylipsum/src/Makefile.am
+++ b/geanylipsum/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanylipsum
 
 geanyplugins_LTLIBRARIES = geanylipsum.la
 
diff --git a/geanymacro/src/Makefile.am b/geanymacro/src/Makefile.am
index 185729bef..866b481b9 100644
--- a/geanymacro/src/Makefile.am
+++ b/geanymacro/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanymacro
 
 geanyplugins_LTLIBRARIES = geanymacro.la
 
diff --git a/geanyminiscript/src/Makefile.am b/geanyminiscript/src/Makefile.am
index 7b1f45d07..dfc9175d5 100644
--- a/geanyminiscript/src/Makefile.am
+++ b/geanyminiscript/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanyminiscript
 
 geanyplugins_LTLIBRARIES = geanyminiscript.la
 
diff --git a/geanynumberedbookmarks/src/Makefile.am b/geanynumberedbookmarks/src/Makefile.am
index 0ddff3d5f..e66ca15fd 100644
--- a/geanynumberedbookmarks/src/Makefile.am
+++ b/geanynumberedbookmarks/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanynumberedbookmarks
 
 geanyplugins_LTLIBRARIES = geanynumberedbookmarks.la
 
diff --git a/geanypg/src/Makefile.am b/geanypg/src/Makefile.am
index d872c325a..bc78f15e9 100644
--- a/geanypg/src/Makefile.am
+++ b/geanypg/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanypg
 
 geanyplugins_LTLIBRARIES = geanypg.la
 
diff --git a/geanyprj/src/Makefile.am b/geanyprj/src/Makefile.am
index b042455f8..ef9e8df6c 100644
--- a/geanyprj/src/Makefile.am
+++ b/geanyprj/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanyprj
 
 geanyplugins_LTLIBRARIES = geanyprj.la
 
diff --git a/geanypy/src/Makefile.am b/geanypy/src/Makefile.am
index 30b9b8da2..73c28b5aa 100644
--- a/geanypy/src/Makefile.am
+++ b/geanypy/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanypy
 
 geanyplugin_LTLIBRARIES		=	geanypy.la
 geanyplugindir				=	$(libdir)/geany
diff --git a/geanysendmail/src/Makefile.am b/geanysendmail/src/Makefile.am
index 8f13671f8..da1b7e543 100644
--- a/geanysendmail/src/Makefile.am
+++ b/geanysendmail/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanysendmail
 
 geanyplugins_LTLIBRARIES = geanysendmail.la
 
diff --git a/geanyvc/src/Makefile.am b/geanyvc/src/Makefile.am
index 8016ce869..d6d6c1bf5 100644
--- a/geanyvc/src/Makefile.am
+++ b/geanyvc/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanyvc
 
 geanyplugins_LTLIBRARIES = geanyvc.la
 
diff --git a/geniuspaste/src/Makefile.am b/geniuspaste/src/Makefile.am
index 84b79bdf1..5e0dbe39f 100644
--- a/geniuspaste/src/Makefile.am
+++ b/geniuspaste/src/Makefile.am
@@ -7,7 +7,6 @@ geanyplugins_LTLIBRARIES = geniuspaste.la
 geniuspaste_la_SOURCES = geniuspaste.c
 geniuspaste_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
-	-DPLUGINDATADIR=\"$(plugindatadir)\" \
 	-DGEANY_VERSION=\"$(GEANY_VERSION)\" \
 	-DG_LOG_DOMAIN=\"GeniusPaste\"
 geniuspaste_la_CFLAGS = \
diff --git a/git-changebar/src/Makefile.am b/git-changebar/src/Makefile.am
index c159d28dd..c18554f1c 100644
--- a/git-changebar/src/Makefile.am
+++ b/git-changebar/src/Makefile.am
@@ -4,8 +4,7 @@ plugin = git-changebar
 geanyplugins_LTLIBRARIES = git-changebar.la
 
 git_changebar_la_SOURCES  = gcb-plugin.c
-git_changebar_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"GitChangeBar\" \
-                            -DPLUGIN=\""$(plugin)"\"
+git_changebar_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"GitChangeBar\"
 git_changebar_la_CFLAGS   = $(AM_CFLAGS) $(GITCHANGEBAR_CFLAGS)
 git_changebar_la_LIBADD   = $(COMMONLIBS) \
                             $(GITCHANGEBAR_LIBS)
diff --git a/lineoperations/src/Makefile.am b/lineoperations/src/Makefile.am
index 844b1dc9a..322659a7a 100644
--- a/lineoperations/src/Makefile.am
+++ b/lineoperations/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = lineoperations
 
 geanyplugins_LTLIBRARIES = lineoperations.la
 
diff --git a/pairtaghighlighter/src/Makefile.am b/pairtaghighlighter/src/Makefile.am
index a396aa4c9..09332c5b5 100644
--- a/pairtaghighlighter/src/Makefile.am
+++ b/pairtaghighlighter/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = pairtaghighlighter
 
 geanyplugins_LTLIBRARIES = pairtaghighlighter.la
 
diff --git a/pretty-printer/src/Makefile.am b/pretty-printer/src/Makefile.am
index 4d65fbf2e..cac0045ca 100644
--- a/pretty-printer/src/Makefile.am
+++ b/pretty-printer/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = pretty-printer
 
 geanyplugins_LTLIBRARIES = pretty-printer.la
 
diff --git a/projectorganizer/src/Makefile.am b/projectorganizer/src/Makefile.am
index 6d2dadd0e..cf0f2f9c0 100644
--- a/projectorganizer/src/Makefile.am
+++ b/projectorganizer/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = projectorganizer
 
 geanyplugins_LTLIBRARIES = projectorganizer.la
 
@@ -14,7 +15,6 @@ projectorganizer_la_SOURCES = \
 	prjorg-menu.c
 
 projectorganizer_la_CPPFLAGS = $(AM_CPPFLAGS) \
-	-DPLUGIN=\"$(plugin)\" \
 	-DG_LOG_DOMAIN=\"ProjectOrganizer\"
 projectorganizer_la_CFLAGS = $(AM_CFLAGS)
 projectorganizer_la_LIBADD = $(COMMONLIBS)
diff --git a/scope/src/Makefile.am b/scope/src/Makefile.am
index 74a2a0748..77bcb98ab 100644
--- a/scope/src/Makefile.am
+++ b/scope/src/Makefile.am
@@ -55,7 +55,6 @@ scope_la_LIBADD = $(COMMONLIBS) $(VTE_LIBS) $(PTY_LIBS)
 
 scope_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"Scope\"
 scope_la_CFLAGS = $(AM_CFLAGS) $(VTE_CFLAGS) \
-	-DPLUGINDATADIR=\"$(plugindatadir)\" \
 	-DPLUGINHTMLDOCDIR=\"$(plugindocdir)/html\" \
 	-Wno-shadow
 
diff --git a/shiftcolumn/src/Makefile.am b/shiftcolumn/src/Makefile.am
index dbe5d5544..ee3095438 100644
--- a/shiftcolumn/src/Makefile.am
+++ b/shiftcolumn/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = shiftcolumn
 
 geanyplugins_LTLIBRARIES = shiftcolumn.la
 
diff --git a/spellcheck/src/Makefile.am b/spellcheck/src/Makefile.am
index 6af787c55..7f0c5d22a 100644
--- a/spellcheck/src/Makefile.am
+++ b/spellcheck/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = spellcheck
 
 geanyplugins_LTLIBRARIES = spellcheck.la
 
diff --git a/tableconvert/src/Makefile.am b/tableconvert/src/Makefile.am
index cb57b6007..6fd6dc6d8 100644
--- a/tableconvert/src/Makefile.am
+++ b/tableconvert/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = tableconvert
 
 geanyplugins_LTLIBRARIES = tableconvert.la
 
diff --git a/treebrowser/src/Makefile.am b/treebrowser/src/Makefile.am
index 43ec95e1a..6156c2691 100644
--- a/treebrowser/src/Makefile.am
+++ b/treebrowser/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = treebrowser
 
 geanyplugins_LTLIBRARIES = treebrowser.la
 
diff --git a/xmlsnippets/src/Makefile.am b/xmlsnippets/src/Makefile.am
index 0b2a30e5e..667fea839 100644
--- a/xmlsnippets/src/Makefile.am
+++ b/xmlsnippets/src/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = xmlsnippets
 
 geanyplugins_LTLIBRARIES = xmlsnippets.la