diff --git a/Makefile.in b/Makefile.in
index 693419f56..923d13f5a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,13 +24,9 @@ endif
 
 SUBDIRS += lib tools daemons
 
-ifeq ("@DMEVENTD@", "yes")
-  SUBDIRS += dmeventd
-endif
-
 ifeq ($(MAKECMDGOALS),distclean)
   SUBDIRS += daemons/clvmd \
-	     dmeventd \
+	     daemons/dmeventd/plugins \
 	     lib/format1 \
 	     lib/format_pool \
 	     lib/locking \
@@ -47,15 +43,13 @@ include make.tmpl
 daemons: lib
 lib: include
 tools: lib
-dmeventd: tools
-po: tools daemons dmeventd
+po: tools daemons
 
 ifeq ("@INTL@", "yes")
 lib.pofile: include.pofile
 tools.pofile: lib.pofile
 daemons.pofile: lib.pofile
-dmeventd.pofile: tools.pofile
-po.pofile: tools.pofile daemons.pofile dmeventd.pofile
+po.pofile: tools.pofile daemons.pofile
 pofile: po.pofile
 endif
 
diff --git a/configure.in b/configure.in
index 11cc45f7d..fc32849d0 100644
--- a/configure.in
+++ b/configure.in
@@ -774,6 +774,7 @@ daemons/Makefile
 daemons/clvmd/Makefile
 daemons/dmeventd/Makefile
 daemons/dmeventd/libdevmapper-event.pc
+daemons/dmeventd/plugins/Makefile
 daemons/dmeventd/plugins/mirror/Makefile
 daemons/dmeventd/plugins/snapshot/Makefile
 doc/Makefile
diff --git a/daemons/Makefile.in b/daemons/Makefile.in
index c5cd3b3a3..9f24883c6 100644
--- a/daemons/Makefile.in
+++ b/daemons/Makefile.in
@@ -19,5 +19,9 @@ ifneq ("@CLVMD@", "none")
   SUBDIRS = clvmd
 endif
 
+ifeq ("@DMEVENTD@", "yes")
+  SUBDIRS += dmeventd/plugins
+endif
+
 include $(top_srcdir)/make.tmpl