diff --git a/libdm/Makefile.in b/libdm/Makefile.in
index e170b5c1d..5283717d0 100644
--- a/libdm/Makefile.in
+++ b/libdm/Makefile.in
@@ -98,6 +98,8 @@ $(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION_DM): $(interface)/%.$(LIB_SUFF
 	rm -f libdevmapper.$(LIB_SUFFIX)
 	$(LN_S) $< libdevmapper.$(LIB_SUFFIX)
 
+CLEAN_TARGETS += libdevmapper.$(LIB_SUFFIX)
+
 .PHONY: distclean_lib distclean
 
 distclean_lib:
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index f6ad7c2e6..afd391613 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -25,5 +25,4 @@ ifeq ("@FSADM@", "yes")
 		$(sbindir)/fsadm
 endif
 
-distclean:
-	$(RM) Makefile clvmd_init_red_hat
+DISTCLEAN_TARGETS += clvmd_init_red_hat
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 72ecd98a1..fd67aff51 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -82,7 +82,7 @@ LVMLIBS = -llvm-internal
 CLEAN_TARGETS = liblvm2cmd.$(LIB_SUFFIX) liblvm2cmd.a liblvm2cmd-static.a lvm lvm.o \
 		lvm2cmd.o lvm2cmd-static.o lvm2cmdlib.o lvm.static \
 		lvm.cflow lvm.xref lvm.tree lvm.rxref lvm.rtree \
-		lvmcmdlib.o lvm-static.o dmsetup.o
+		lvmcmdlib.o lvm-static.o dmsetup.o dmsetup
 
 ifeq ("@CMDLIB@", "yes")
 	TARGETS += liblvm2cmd.$(LIB_SUFFIX)