--- Makefile.orig	2012-11-24 19:34:13.213324417 +0100
+++ Makefile	2012-11-24 19:35:39.068425956 +0100
@@ -10,9 +10,9 @@
 endif
 
 CFLAGS+=-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare
-CFLAGS+=-g
 CFLAGS+=-std=gnu99
 CFLAGS+=-pedantic
+CFLAGS+=$(OPTFLAGS)
 CPPFLAGS+=-DSYSCONFDIR=\"$(SYSCONFDIR)\"
 CPPFLAGS+=-DVERSION=\"${GIT_VERSION}\"
 CFLAGS+=-Iinclude
@@ -49,18 +49,15 @@
 OBJS:=$(OBJS:.c=.o)
 
 src/%.o: src/%.c
-	@$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
-	@echo " CC $<"
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
 %.o: %.c include/%.h
-	@$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
-	@echo " CC $<"
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
 all: i3status manpage
 
 i3status: ${OBJS}
-	@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-	@echo " LD $@"
+	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 clean:
 	rm -f *.o src/*.o