diff --git a/Makefile.am b/Makefile.am
index 4e70251bd..14ddf443d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src data po icons
+SUBDIRS = src data plugins po icons
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/configure.ac b/configure.ac
index 38a181c37..768e5b966 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,14 +65,17 @@ AC_ARG_ENABLE(site-packages,
 instead of DATADIR/gajim/src.])]
 ,
 AC_SUBST([gajim_srcdir], [\${pkgpythondir}])
+AC_SUBST([gajim_pluginsdir], [\${pkgpythondir}])
 ,
 AC_SUBST([gajim_srcdir], [\${datadir}/\${PACKAGE}/src])
+AC_SUBST([gajim_pluginsdir], [\${datadir}/\${PACKAGE}/plugins])
 )
 
 AS_AC_EXPAND(GAJIM_SRCDIR, "${gajim_srcdir}")
 AS_AC_EXPAND(PKGDATADIR, "${datadir}/${PACKAGE}")
 AS_AC_EXPAND(DOCDIR, "${docdir}")
 AS_AC_EXPAND(LOCALEDIR, "${localedir}")
+AS_AC_EXPAND(GAJIM_PLUGINSDIR, "${gajim_pluginsdir}")
 
 AC_SUBST(VERSION)
 AC_SUBST(PACKAGE)
@@ -94,6 +97,7 @@ AC_CONFIG_FILES([
 	scripts/gajim-remote:scripts/gajim.in
 	scripts/gajim-history-manager:scripts/gajim.in
 	po/Makefile.in
+	plugins/Makefile
 ])
 AC_OUTPUT
 echo "
@@ -101,6 +105,7 @@ echo "
   Installation:
     Prefix ........... ${prefix}
     Python modules ... ${GAJIM_SRCDIR}
+    Plugins .. ....... ${GAJIM_PLUGINSDIR}
     Documentation .... ${DOCDIR}
     Others ........... ${PKGDATADIR}
 *****************************"
diff --git a/src/Makefile.am b/src/Makefile.am
index 29333e3f2..79b8d19b1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,8 @@ nobase_dist_gajimsrc_PYTHON = \
 	$(srcdir)/common/xmpp/*.py \
 	$(srcdir)/common/zeroconf/*.py \
 	$(srcdir)/command_system/*.py \
-	$(srcdir)/command_system/implementation/*.py
+	$(srcdir)/command_system/implementation/*.py \
+	$(srcdir)/plugins/*.py
 
 dist-hook:
 			rm -f $(distdir)/ipython_view.py