diff --git a/Makefile b/Makefile
index 54c721e..48dbdbe 100644
--- a/Makefile
+++ b/Makefile
@@ -18,9 +18,9 @@ distclean:
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) distclean) || exit; done
 
 dist:
-	$(RM) -r $(PACKAGE)-$(VERSION)
-	$(LN) -s . $(PACKAGE)-$(VERSION)
-	@$(TAR) $(PACKAGE)-$(VERSION).tar.gz \
+	$(RM) -r -- $(PACKAGE)-$(VERSION)
+	$(LN) -s -- . $(PACKAGE)-$(VERSION)
+	@$(TAR) $(PACKAGE)-$(VERSION).tar.gz -- \
 		$(PACKAGE)-$(VERSION)/data/Makefile \
 		$(PACKAGE)-$(VERSION)/data/mailer.desktop \
 		$(PACKAGE)-$(VERSION)/data/project.conf \
@@ -49,7 +49,7 @@ dist:
 		$(PACKAGE)-$(VERSION)/COPYING \
 		$(PACKAGE)-$(VERSION)/config.h \
 		$(PACKAGE)-$(VERSION)/project.conf
-	$(RM) $(PACKAGE)-$(VERSION)
+	$(RM) -- $(PACKAGE)-$(VERSION)
 
 install: all
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done
diff --git a/data/Makefile b/data/Makefile
index 14ec345..0f7aac5 100644
--- a/data/Makefile
+++ b/data/Makefile
@@ -13,9 +13,9 @@ distclean: clean
 
 install: all
 	$(MKDIR) $(DESTDIR)$(PREFIX)/share/applications
-	$(INSTALL) -m 0644 mailer.desktop $(DESTDIR)$(PREFIX)/share/applications/mailer.desktop
+	$(INSTALL) -m 0644 -- mailer.desktop $(DESTDIR)$(PREFIX)/share/applications/mailer.desktop
 
 uninstall:
-	$(RM) $(DESTDIR)$(PREFIX)/share/applications/mailer.desktop
+	$(RM) -- $(DESTDIR)$(PREFIX)/share/applications/mailer.desktop
 
 .PHONY: all clean distclean install uninstall
diff --git a/src/Makefile b/src/Makefile
index fa2013d..1619392 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -47,20 +47,20 @@ main.o: main.c mailer.h
 
 clean:
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) clean) || exit; done
-	$(RM) $(mailer_OBJS)
+	$(RM) -- $(mailer_OBJS)
 
 distclean:
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) distclean) || exit; done
-	$(RM) $(mailer_OBJS)
-	$(RM) $(TARGETS)
+	$(RM) -- $(mailer_OBJS)
+	$(RM) -- $(TARGETS)
 
 install: all
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done
 	$(MKDIR) $(DESTDIR)$(BINDIR)
-	$(INSTALL) -m 0755 mailer $(DESTDIR)$(BINDIR)/mailer
+	$(INSTALL) -m 0755 -- mailer $(DESTDIR)$(BINDIR)/mailer
 
 uninstall:
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit; done
-	$(RM) $(DESTDIR)$(BINDIR)/mailer
+	$(RM) -- $(DESTDIR)$(BINDIR)/mailer
 
 .PHONY: all subdirs clean distclean install uninstall
diff --git a/src/account/Makefile b/src/account/Makefile
index 1c3f4f2..494dad5 100644
--- a/src/account/Makefile
+++ b/src/account/Makefile
@@ -69,28 +69,28 @@ rss.o: rss.c account.h
 	$(CC) $(rss_CFLAGS) -c rss.c
 
 clean:
-	$(RM) $(mbox_OBJS) $(pop3_OBJS) $(imap4_OBJS) $(nntp_OBJS) $(rss_OBJS)
+	$(RM) -- $(mbox_OBJS) $(pop3_OBJS) $(imap4_OBJS) $(nntp_OBJS) $(rss_OBJS)
 
 distclean: clean
-	$(RM) $(TARGETS)
+	$(RM) -- $(TARGETS)
 
 install: all
 	$(MKDIR) $(DESTDIR)$(LIBDIR)/Mailer/account
-	$(INSTALL) -m 0644 mbox.so $(DESTDIR)$(LIBDIR)/Mailer/account/mbox.so
+	$(INSTALL) -m 0644 -- mbox.so $(DESTDIR)$(LIBDIR)/Mailer/account/mbox.so
 	$(MKDIR) $(DESTDIR)$(LIBDIR)/Mailer/account
-	$(INSTALL) -m 0644 pop3.so $(DESTDIR)$(LIBDIR)/Mailer/account/pop3.so
+	$(INSTALL) -m 0644 -- pop3.so $(DESTDIR)$(LIBDIR)/Mailer/account/pop3.so
 	$(MKDIR) $(DESTDIR)$(LIBDIR)/Mailer/account
-	$(INSTALL) -m 0644 imap4.so $(DESTDIR)$(LIBDIR)/Mailer/account/imap4.so
+	$(INSTALL) -m 0644 -- imap4.so $(DESTDIR)$(LIBDIR)/Mailer/account/imap4.so
 	$(MKDIR) $(DESTDIR)$(LIBDIR)/Mailer/account
-	$(INSTALL) -m 0644 nntp.so $(DESTDIR)$(LIBDIR)/Mailer/account/nntp.so
+	$(INSTALL) -m 0644 -- nntp.so $(DESTDIR)$(LIBDIR)/Mailer/account/nntp.so
 	$(MKDIR) $(DESTDIR)$(LIBDIR)/Mailer/account
-	$(INSTALL) -m 0644 rss.so $(DESTDIR)$(LIBDIR)/Mailer/account/rss.so
+	$(INSTALL) -m 0644 -- rss.so $(DESTDIR)$(LIBDIR)/Mailer/account/rss.so
 
 uninstall:
-	$(RM) $(DESTDIR)$(LIBDIR)/Mailer/account/mbox.so
-	$(RM) $(DESTDIR)$(LIBDIR)/Mailer/account/pop3.so
-	$(RM) $(DESTDIR)$(LIBDIR)/Mailer/account/imap4.so
-	$(RM) $(DESTDIR)$(LIBDIR)/Mailer/account/nntp.so
-	$(RM) $(DESTDIR)$(LIBDIR)/Mailer/account/rss.so
+	$(RM) -- $(DESTDIR)$(LIBDIR)/Mailer/account/mbox.so
+	$(RM) -- $(DESTDIR)$(LIBDIR)/Mailer/account/pop3.so
+	$(RM) -- $(DESTDIR)$(LIBDIR)/Mailer/account/imap4.so
+	$(RM) -- $(DESTDIR)$(LIBDIR)/Mailer/account/nntp.so
+	$(RM) -- $(DESTDIR)$(LIBDIR)/Mailer/account/rss.so
 
 .PHONY: all clean distclean install uninstall