--- a/Makefile
+++ b/Makefile
@@ -25,11 +25,11 @@ HAVE_LINUX_LOSETUP	= 1
 HAVE_LINUX_PIVOT	= 1
 HAVE_LINUX_MOUNT	= 1
 HAVE_BSD_MOUNT		= 0
-MOUNT_TYPE		= '"ext3"'
+MOUNT_TYPE		= '"ext4"'
 
-OPT = -O3
+CFLAGS ?= -O3 -Wall -Wmissing-prototypes
 
-CFLAGS = $(OPT) -Wall -Wmissing-prototypes \
+DEFS = \
 	-DHAVE_GZIP=$(HAVE_GZIP) \
 	-DHAVE_LINUX_ATTR=$(HAVE_LINUX_ATTR) \
  	-DHAVE_LINUX_CHROOT=$(HAVE_LINUX_CHROOT) \
@@ -39,13 +39,15 @@ CFLAGS = $(OPT) -Wall -Wmissing-prototyp
 	-DHAVE_BSD_MOUNT=$(HAVE_BSD_MOUNT) \
 	-DMOUNT_TYPE=$(MOUNT_TYPE)
 
-LDFLAGS = -static
+CPPFLAGS += $(DEFS)
+
+LDFLAGS += -static
 LIBS = -lz
 
 
 DESTDIR =
-BINDIR = /bin
-MANDIR = /usr/man
+BINDIR = /usr/bin
+MANDIR = /usr/share/man
 
 
 OBJS = sash.o cmds.o cmd_dd.o cmd_ed.o cmd_grep.o cmd_ls.o cmd_tar.o \
@@ -53,14 +55,16 @@ OBJS = sash.o cmds.o cmd_dd.o cmd_ed.o c
 
 
 sash:	$(OBJS)
-	$(CC) $(LDFLAGS) -o sash $(OBJS) $(LIBS)
-	strip sash
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 clean:
 	rm -f $(OBJS) sash
 
 install: sash
-	cp sash $(DESTDIR)/$(BINDIR)/sash
-	cp sash.1 $(DESTDIR)/$(MANDIR)/man1/sash.1
+	cp sash $(DESTDIR)$(BINDIR)/sash
+	cp sash.1 $(DESTDIR)$(MANDIR)/man1/sash.1
+
+%.o: %.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
 
 $(OBJS):	sash.h
