diff --git a/Makefile b/Makefile
index 65cca10..de7479a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,32 +1,39 @@
-SHELL := /bin/bash
-
+# Installation paths
 PREFIX ?= /usr/local
 SBINDIR ?= $(PREFIX)/sbin
 SYSCONFDIR ?= $(PREFIX)/etc
 LOCALSTATEDIR ?= $(PREFIX)/var
 RUNSTATEDIR ?= $(LOCALSTATEDIR)/run
+
+# Compilers and tools
 GO ?= $(shell type -a -P go | head -n 1)
 
+# Build-time variables
 VERSION ?= $(shell git describe --tags --dirty)
 
 build:
-	mkdir -p build
+	mkdir build
 	cd src/enit; $(GO) build -ldflags "-w -X main.version=$(VERSION)" -o ../../build/enit enit
 	cd src/esvm; $(GO) build -ldflags "-w -X main.version=$(VERSION)" -o ../../build/esvm esvm
 	cd src/ectl; $(GO) build -ldflags "-w -X main.version=$(VERSION) -X main.sysconfdir=$(SYSCONFDIR) -X main.runstatedir=$(RUNSTATEDIR)" -o ../../build/ectl ectl
 
-install: build/enit build/ectl
-	mkdir -p $(DESTDIR)$(SBINDIR)
-	mkdir -p $(DESTDIR)$(SYSCONFDIR)/esvm/services
-	cp build/enit $(DESTDIR)$(SBINDIR)/enit
-	cp build/esvm $(DESTDIR)$(SBINDIR)/esvm
-	cp build/ectl $(DESTDIR)$(SBINDIR)/ectl
+install: build/enit build/ectl build/esvm
+	# Create directories
+	install -d $(DESTDIR)$(SBINDIR)
+	# Install binaries
+	install -m755 build/{enit,esvm,ectl} -t $(DESTDIR)$(SBINDIR)
 
 install-services:
-	mkdir -p $(DESTDIR)$(SYSCONFDIR)/esvm/services
-	cp services/* -t $(DESTDIR)$(SYSCONFDIR)/esvm/services
+	# Create directory
+	install -d $(DESTDIR)$(SYSCONFDIR)/esvm/services
+	# Install services
+	install -m644 services/*.esv -t $(DESTDIR)$(SYSCONFDIR)/esvm/services
+
+uninstall:
+	-rm -f $(DESTDIR)$(SBINDIR)/{enit,esvm,ectl}
+	-rm -rf $(DESTDIR)$(SYSCONFDIR)/esvm
 
 clean:
 	rm -r build/
 
-.PHONY: build
+.PHONY: build install install-services uninstall clean