diff --git a/Makefile b/Makefile
index 6a6e8dc2..10794fab 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,16 @@
 install:
-	gcc -o ponysaytruncater ponysaytruncater.c
-	mkdir -p $(DESTDIR)/usr/share/ponies
-	mkdir -p $(DESTDIR)/usr/share/ttyponies
-	cp -r ponies/*.pony $(DESTDIR)/usr/share/ponies/
-	cp -r ttyponies/*.pony $(DESTDIR)/usr/share/ttyponies/
-	install -Dm755 ponysay $(DESTDIR)/usr/bin/ponysay
-	install -Dm755 ponysaytruncater $(DESTDIR)/usr/bin/ponysaytruncater
-	ln -sf ponysay $(DESTDIR)/usr/bin/ponythink
+	gcc -o "ponysaytruncater" "ponysaytruncater.c"
+	mkdir -p "$(DESTDIR)/usr/share/ponies"
+	mkdir -p "$(DESTDIR)/usr/share/ttyponies"
+	cp -r "ponies/*.pony" "$(DESTDIR)/usr/share/ponies/"
+	cp -r "ttyponies/*.pony" "$(DESTDIR)/usr/share/ttyponies/"
+	install "ponysay" "$(DESTDIR)/usr/bin/ponysay"
+	install -s "ponysaytruncater" "$(DESTDIR)/usr/bin/ponysaytruncater"
+	ln -sf "ponysay" "$(DESTDIR)/usr/bin/ponythink"
 
 uninstall:
-	rm -fr $(DESTDIR)/usr/share/ponies
-#	cp -r ponies/*.pony $(DESTDIR)/usr/share/ponies/
-	rm -fr $(DESTDIR)/usr/share/ttyponies
-#	cp -r ttyponies/*.pony $(DESTDIR)/usr/share/ttyponies/
-	rm -f $(DESTDIR)/usr/bin/ponysay
-	rm -f $(DESTDIR)/usr/bin/ponysaytruncater
-	unlink $(DESTDIR)/usr/bin/ponythink
+	rm -fr "$(DESTDIR)/usr/share/ponies"
+	rm -fr "$(DESTDIR)/usr/share/ttyponies"
+	unlink "$(DESTDIR)/usr/bin/ponysay"
+	unlink "$(DESTDIR)/usr/bin/ponysaytruncater"
+	unlink "$(DESTDIR)/usr/bin/ponythink"