diff --git a/Makefile b/Makefile
index 2d4cde2..f18ba60 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 .POSIX:
-.SUFFIXES:
 
 VERSION = 1.0
 TARGET = ccc
@@ -8,18 +7,21 @@ PREFIX ?= /usr/local
 BINDIR = $(PREFIX)/bin
 MANDIR = $(PREFIX)/share/man/man1
 
-CFLAGS = -Os -march=native -mtune=native -pipe -s -flto -std=c99 -pedantic -Wall -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600
+CFLAGS += -std=c99 -pedantic -Wall -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600
 
 SRC = ccc.c util.c file.c icons.c
+OBJS = $(SRC:.c=.o)
 
-$(TARGET): $(SRC) config.h 
-	$(CC) $(SRC) -o $@ $(CFLAGS) $(LDFLAGS)
+.c.o:
+	$(CC) -o $@ $(CFLAGS) -c $<
+
+$(TARGET): $(OBJS) config.h
+	$(CC) -o $@ $(OBJS) $(LIBS)
 
 dist:
 	mkdir -p $(TARGET)-$(VERSION)
 	cp -R README.md $(MANPAGE) $(TARGET) $(TARGET)-$(VERSION)
-	tar -cf $(TARGET)-$(VERSION).tar $(TARGET)-$(VERSION)
-	gzip $(TARGET)-$(VERSION).tar
+	tar -czf $(TARGET)-$(VERSION).tar.gz $(TARGET)-$(VERSION)
 	rm -rf $(TARGET)-$(VERSION)
 
 install: $(TARGET)
@@ -31,11 +33,11 @@ install: $(TARGET)
 	chmod 644 $(DESTDIR)$(MANDIR)/$(MANPAGE)
 
 uninstall:
-	rm $(DESTDIR)$(BINDIR)/$(TARGET)
-	rm $(DESTDIR)$(MANDIR)/$(MANPAGE)
+	rm -f $(DESTDIR)$(BINDIR)/$(TARGET)
+	rm -f $(DESTDIR)$(MANDIR)/$(MANPAGE)
 
 clean:
-	rm $(TARGET)
+	rm -f $(TARGET) *.o
 
 all: $(TARGET)