--- a/Makefile	2005-03-26 22:29:48.000000000 +0100
+++ b/Makefile	2008-01-27 19:43:33.000000000 +0100
@@ -1,15 +1,15 @@
 
-CFLAGS			= -Wall -Os
-INCS			= -I/usr/X11R6/include/X11
-LIBS			= -L/usr/X11R6/lib -lXpm -lXext -lX11
-INSTALL_PREFIX	= /usr/local
+CFLAGS			+= -Wall
+INCS			= -I/usr/include/X11
+LIBS			= -L/usr/lib -lXpm -lXext -lX11
+INSTALL_PREFIX	= /usr
 
 
 all: cputnik.c docklib.o master.h mask.h
-	gcc $(CFLAGS) $(INCS) docklib.o cputnik.c -o cputnik $(LIBS)
+	$(CC) $(CFLAGS) $(INCS) docklib.o cputnik.c -o cputnik $(LDFLAGS) $(LIBS)
 
 docklib.o: docklib.c docklib.h
-	gcc $(CFLAGS) $(INCS) -c docklib.c
+	$(CC) $(CFLAGS) $(INCS) -c docklib.c
 
 install:
 	cp ./cputnik $(INSTALL_PREFIX)/bin