diff --git a/Makefile b/Makefile
index d5bce0a..c7667ed 100644
--- a/Makefile
+++ b/Makefile
@@ -19,14 +19,10 @@ endif
 
 install:
 	@echo Installing the executable to $(BINDIR)
-	@mkdir -p $(BINDIR)
-	@cp -f pb $(BINDIR)/pb
-	@chmod 755 $(BINDIR)/pb
+	@install -D -m 0755 pb $(BINDIR)/pb
 	@echo Installing the manual page to $(MANDIR)/man1
-	@mkdir -p $(MANDIR)/man1
-	@cp -f pb.1 $(MANDIR)/man1/pb.1
-	@chmod 644 $(MANDIR)/man1/pb.1
-ifdef CPLDIR
+	@install -D -m 0644 pb.1 $(MANDIR)/man1/pb.1
+ifeq ($(CPLDIR),)
 	@echo Installing the command completion to $(CPLDIR)
 	@mkdir -p $(CPLDIR)
 	@cp -f pb.d $(CPLDIR)/pb
@@ -38,7 +34,7 @@ uninstall:
 	@rm -f $(BINDIR)/pb
 	@echo Removing the manual page from $(MANDIR)/man1
 	@rm -f $(BINDIR)/man1/pb.1
-ifdef CPLDIR
+ifeq ($(CPLDIR),)
 	@echo Removing the command completion from $(CPLDIR)
 	@rm -f $(CPLDIR)/pb
 endif