diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in
index c88505f18..cc1642af7 100644
--- a/libdm/make.tmpl.in
+++ b/libdm/make.tmpl.in
@@ -533,7 +533,7 @@ endif
 
 ifeq ("@USE_TRACKING@","yes")
 ifeq (,$(findstring $(MAKECMDGOALS),cscope.out cflow clean distclean lcov \
- help check check_local check_cluster check_lvmetad check_lvmpolld))
+ help check check_local check_cluster check_lvmpolld))
     ifdef SOURCES
        -include $(SOURCES:.c=.d) $(CXXSOURCES:.cpp=.d)
     endif
diff --git a/make.tmpl.in b/make.tmpl.in
index e52827be3..1a101fc67 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -258,12 +258,10 @@ endif
   ifneq ("@BUILD_DMEVENTD@", "yes")
   ifneq ("@BUILD_LVMLOCKD@", "yes")
   ifneq ("@BUILD_LVMPOLLD@", "yes")
-  ifneq ("@BUILD_LVMETAD@", "yes")
     DEFS += -DDEBUG_MEM
   endif
   endif
   endif
-  endif
 endif
 
 # end of fPIC protection
@@ -583,7 +581,7 @@ endif
 
 ifeq ("$(USE_TRACKING)","yes")
 ifeq (,$(findstring $(MAKECMDGOALS),cscope.out cflow clean distclean lcov \
- help check check_local check_cluster check_lvmetad check_lvmpolld))
+ help check check_local check_cluster check_lvmpolld))
     ifdef SOURCES
        -include $(SOURCES:.c=.d) $(CXXSOURCES:.cpp=.d)
     endif