diff --git a/Makefile b/Makefile
index fe3bd234..c8369d9e 100644
--- a/Makefile
+++ b/Makefile
@@ -62,9 +62,17 @@ libcyclone.so.1: runtime.c include/cyclone/runtime.h
 	gcc -shared -Wl,-soname,libcyclone.so.1 -o libcyclone.so.1.0.1 runtime.o
 
 libcyclone.a: runtime.c include/cyclone/runtime.h include/cyclone/types.h gc.c dispatch.c
+	echo $(CC_PROG)
+	echo $(CC_EXEC)
+	echo $(CC_LIB)
 	$(CC) $(CFLAGS) -c -Iinclude dispatch.c -o dispatch.o
 	$(CC) $(CFLAGS) -std=gnu99 -c -Iinclude gc.c -o gc.o
-	$(CC) $(CFLAGS) -c -Iinclude -DCYC_INSTALL_DIR=\"$(PREFIX)\" -DCYC_INSTALL_LIB=\"$(LIBDIR)\" -DCYC_INSTALL_INC=\"$(INCDIR)\" -DCYC_INSTALL_SLD=\"$(DATADIR)\" runtime.c -o runtime.o
+	$(CC) $(CFLAGS) -c -Iinclude \
+                  -DCYC_INSTALL_DIR=\"$(PREFIX)\" \
+                  -DCYC_INSTALL_LIB=\"$(LIBDIR)\" \
+                  -DCYC_INSTALL_INC=\"$(INCDIR)\" \
+                  -DCYC_INSTALL_SLD=\"$(DATADIR)\" \
+                  runtime.c -o runtime.o
 	$(AR) rcs libcyclone.a runtime.o gc.o dispatch.o
 # Instructions from: http://www.adp-gmbh.ch/cpp/gcc/create_lib.html
 # Note compiler will have to link to this, eg:
diff --git a/Makefile.config b/Makefile.config
index dca43118..fb67ba2e 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -1,8 +1,12 @@
 
 # install configuration
 
-CFLAGS    ?= -g -Wall
-CC        ?= cc
+CFLAGS  ?= -g -Wall
+CC      ?= cc
+CC_PROG ?= "$(CC) %src-file% $(CFLAGS) -c -o %exec-file%.o"
+CC_EXEC ?= "$(CC) %exec-file%.o %objs% -pthread -lcyclone -lck -lm $(CFLAGS) -o %exec-file%"
+CC_LIB  ?= "$(CC) %src-file% $(CFLAGS) -c -o %exec-file%.o"
+
 AR        ?= ar
 #CD        ?= cd
 RM        ?= rm -f