diff --git a/Makefile.am b/Makefile.am
index 1bb39b2d2..99a138018 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src data po icons
+SUBDIRS = src data po icons plugins
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/configure.ac b/configure.ac
index 1895fe2d2..d9ce3bf06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,6 +79,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 "
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
new file mode 100644
index 000000000..70c35b71b
--- /dev/null
+++ b/plugins/Makefile.am
@@ -0,0 +1,15 @@
+INCLUDES = \
+	$(PYTHON_INCLUDES)
+
+gajimpluginsdir = $(gajim_pluginsdir)
+
+dist_gajimplugins_PYTHON = 
+
+nobase_gajimplugins_DATA = \
+	$(srcdir)/*/*.py \
+	$(srcdir)/*/manifest.ini \
+	$(srcdir)/*/*.ui \
+	$(srcdir)/*/*.png
+
+
+MAINTAINERCLEANFILES = Makefile.in