diff --git a/Makefile b/Makefile
index 59581c0..4aa6841 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ PACKAGE	= strace
 VERSION	= 0.0.0
 SUBDIRS	= src
 RM	= rm -f
-LN	= ln -sf
+LN	= ln -f
 TAR	= tar -czvf
 
 
@@ -19,11 +19,12 @@ distclean:
 
 dist:
 	$(RM) -r $(PACKAGE)-$(VERSION)
-	$(LN) . $(PACKAGE)-$(VERSION)
+	$(LN) -s . $(PACKAGE)-$(VERSION)
 	@$(TAR) $(PACKAGE)-$(VERSION).tar.gz \
 		$(PACKAGE)-$(VERSION)/src/strace.c \
 		$(PACKAGE)-$(VERSION)/src/project.conf \
 		$(PACKAGE)-$(VERSION)/Makefile \
+		$(PACKAGE)-$(VERSION)/COPYING \
 		$(PACKAGE)-$(VERSION)/project.conf
 	$(RM) $(PACKAGE)-$(VERSION)
 
diff --git a/src/Makefile b/src/Makefile
index 862dee9..742e826 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,11 +2,13 @@ TARGETS	= strace
 PREFIX	= /usr/local
 DESTDIR	= 
 BINDIR	= $(PREFIX)/bin
-INCLUDEDIR= $(PREFIX)/include
 CC	= cc
+CPPFLAGSF=
 CPPFLAGS=
-CFLAGSF	= -W -Wall -ansi
+CFLAGSF	= -W
+CFLAGS	= -Wall -g -O2 -pedantic
 RM	= rm -f
+LN	= ln -f
 MKDIR	= mkdir -p
 INSTALL	= install
 
@@ -14,10 +16,11 @@ INSTALL	= install
 all: $(TARGETS)
 
 strace_OBJS = strace.o
-strace_CFLAGS = $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
+strace_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
+strace_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
 
 strace: $(strace_OBJS)
-	$(CC) -o strace $(strace_OBJS) $(LDFLAGSF) $(LDFLAGS)
+	$(CC) -o strace $(strace_OBJS) $(strace_LDFLAGS)
 
 strace.o: strace.c
 	$(CC) $(strace_CFLAGS) -c strace.c
diff --git a/src/project.conf b/src/project.conf
index 8b3ef75..b9d6c9b 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -1,6 +1,8 @@
 targets=strace
-cflags_force=-W -Wall -ansi
+cflags_force=-W
+cflags=-Wall -g -O2 -pedantic
 
 [strace]
 type=binary
 sources=strace.c
+install=$(BINDIR)