diff --git a/Makefile b/Makefile
index 3470cddb..6daf28fc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,29 @@
-SOURCES:= main.c pdu.c net.c
+SOURCES:= pdu.c net.c
+OBJECTS:= $(patsubst %.c, %.o, $(SOURCES))
 HEADERS:=coap.h debug.h pdu.h net.h
-CFLAGS:=-g 
+CFLAGS:=-g -Wall -std=c99 # -pedantic  # FIXME: pdu.h contains GCC extensions
+PROGRAM:=coap
+VERSION:=0.01
+DISTDIR=$(PROGRAM)-$(VERSION)
+FILES:=main.c Makefile $(SOURCES) $(HEADERS) 
 
-coap:	$(SOURCES)
-	$(CC) $(CFLAGS) -o $@ $^
+.PHONY: clean distclean
+
+$(PROGRAM):	main.o $(OBJECTS)
+	$(CC) $(LDFLAGS) -o $@ $^
+
+# build main.o separately as c99 has no getaddrinfo, so CC will complain
+main.o:	main.c
+	$(CC) -g -Wall -c -o main.o main.c 
+
+clean:
+	@rm -f $(PROGRAM) main.o $(OBJECTS)
+
+distclean:	clean
+	@rm -rf $(DISTDIR)
+	@rm -f *~ $(DISTDIR).tar.gz
+
+dist:
+	test -d $(DISTDIR) || mkdir $(DISTDIR)
+	cp $(FILES) $(DISTDIR)
+	tar czf $(DISTDIR).tar.gz $(DISTDIR)