diff --git a/make/defs.mk b/make/defs.mk
index 1fa07a0a..e3484c97 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -376,7 +376,7 @@ INSTALLED_CGI               += $(addprefix $(INSTALL_CGIDIR)/,$(EXE_CGI))
 # -- SYSTEMD
 INSTALLATION_FILE_TYPES     += SYSTEMD
 BUILD_SYSTEMDDIR             = $(TOPDIR)/bin/systemd
-LOCAL_SYSTEMD               += $(filter-out $(DONT_INSTALL),$(wildcard *.service))
+LOCAL_SYSTEMD               += $(filter-out $(DONT_INSTALL),$(wildcard *.service *.mount *.target))
 INSTALL_SYSTEMDDIR           = $(SYSTEMD_DIR)
 INSTALLED_SYSTEMD           += $(addprefix $(INSTALL_SYSTEMDDIR)/,$(LOCAL_SYSTEMD))
 
diff --git a/make/rules.mk b/make/rules.mk
index 6aee74ef..560395bb 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -133,6 +133,8 @@ prepend_header:
 remake:
 	set -e; make $(addprefix -W ,$(SRC_FILES)) $(filter-out remake,$(MAKECMDGOALS))
 
+echo:
+
 echo-all:
 	@echo "ALL                  = $(ALL)"
 
@@ -347,7 +349,7 @@ endef
 $(INSTALL_INITDIR)/%: %.init | provide_dir_INIT
 	$(INSTALL) -p -o $(INITOWNER) -g $(INITGROUP) -m $(INITMODE) $< $@
 
-$(INSTALL_SYSTEMDDIR)/%.service: %.service | provide_dir_SYSTEMD
+$(INSTALL_SYSTEMDDIR)/%: % | provide_dir_SYSTEMD
 	$(INSTALL) -p -o $(SYSTEMDOWNER) -g $(SYSTEMDGROUP) -m $(SYSTEMDMODE) $< $@
 
 $(INSTALL_LOGROTDIR)/%: %.logrotate | provide_dir_LOGROT