diff --git a/Makefile b/Makefile
index 4ea8508..0914571 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 CC = kos32-gcc
 LD = kos32-ld
+AR = kos32-ar
 
 HOME_DIR = $(shell echo ~)
 TOOLCHAIN_DIR = $(abspath /home/autobuild/tools/win32/)
@@ -8,12 +9,15 @@ SDK_DIR = $(CONTRIB_DIR)/sdk
 C_LAYER = $(CONTRIB_DIR)/C_Layer
 
 CFLAGS = -fno-ident -fomit-frame-pointer -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32  -I $(SDK_DIR)/sources/newlib/libc/include
-LDFLAGS = -static -S -nostdlib -T app.lds --subsystem native -L $(TOOLCHAIN_DIR)/lib -L $TOOLCHAIN_DIR/mingw32/lib -L $(SDK_DIR)/lib
+LDFLAGS = -static -S -nostdlib -T app.lds --subsystem native -DNDEBUG -L $(TOOLCHAIN_DIR)/lib -L $(TOOLCHAIN_DIR)/mingw32/lib -L $(SDK_DIR)/lib
 
-INCLUDES = -I$(SDK_DIR)/sources/newlib/libc/include -DNDEBUG -I..
+INCLUDES = -I $(SDK_DIR)/sources/newlib/libc/include -I..
 LIBPATH = -L $(SDK_DIR)/lib -L $(TOOLCHAIN_DIR)/mingw32/lib
 
-SOURCES := lib/microtar/src/microtar.c lib/ccsv/src/ccsv.c \
+MICROTAR_SOURCES = lib/microtar/src/microtar.c
+CCSV_SOURCE = lib/ccsv/src/ccsv.c
+
+SOURCES := $(MICROTAR_SOURCES) $(CCSV_SOURCE) \
 		src/kospm_tar.c src/kospm_list.c src/kospm_common.c \
 		src/kospm_package.c src/kospm_db.c src/kospm.c
 
@@ -22,7 +26,10 @@ OBJECTS := $(SOURCES:.c=.o)
 default: libkospm.a
 
 libkospm.a: $(OBJECTS) Makefile
-	ar -crs libkospm.a $(OBJECTS)
+	$(AR) -crs libkospm.a $(OBJECTS)
 
 %.o : %.c Makefile $(SOURCES)
 	$(CC) $(CFLAGS) $(INCLUDES) -o $@ $<
+
+clean:
+	rn -f $(OBJECTS) libkospm.a