diff --git a/Makefile b/Makefile
index 7e4dbd2d9..dd6aacbce 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,11 @@ usage:
 # 'make install' target.
 # 
 # etcfiles has to be done first.
-world: mkfiles includes depend libraries install postinstall
+.if ${COMPILER_TYPE} == "ack"
+world: mkfiles includes depend libraries install
+.elif ${COMPILER_TYPE} == "gnu"
+world: mkfiles includes depend gnu-libraries install
+.endif
 
 mkfiles:
 	cp etc/mk/*.mk /etc/mk/
@@ -87,6 +91,3 @@ clean::
 	cd lib && sh gnu_build.sh clean
 	cd commands && $(MAKE) clean
 	cd test && $(MAKE) clean
-
-postinstall:
-	cd etc && $(MAKE) $@
diff --git a/etc/Makefile b/etc/Makefile
index eb4eb6b21..3971ab2a0 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,3 @@
-
 ETC=/etc/
 USRETC=/usr/etc/
 FILES1=fstab group hostname.file inet.conf motd.install mtab passwd profile \
@@ -34,7 +33,3 @@ install::
 	for u in /usr/ast ~root; do cp ast/.[aepv]* $$u ; done
 	@echo "Installing fonts.."
 	install -m 644 -o root -g operator fonts/*.fnt /usr/lib/fonts/
-
-postinstall:
-	binsizes normal
-
diff --git a/kernel/Makefile b/kernel/Makefile
index d60d2107c..e624a3ed4 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -19,7 +19,7 @@ CPPFLAGS+= -fno-builtin -ffreestanding -fno-stack-protector
 LDFLAGS+= -T arch/${ARCH}/kernel.lds
 LDFLAGS+= -nostdlib
 DPADD+=	${LIBC}
-LDADD+=	-lgcc -lc -lgcc
+LDADD+=	-lc
 .endif
 
 CPPFLAGS+=	-I${.CURDIR}/arch/${ARCH}/include -I${MINIXSRCDIR}
diff --git a/test/Makefile b/test/Makefile
index 86bd4fcdf..92ab3a5f6 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,7 +1,6 @@
 # Makefile for the tests.
 
-CC =	exec cc
-GCC =   /usr/gnu/bin/gcc
+GCC=   /usr/gnu/bin/gcc
 CFLAGS= -O -D_MINIX -D_POSIX_SOURCE
 CFLAGS-GCC= $(CFLAGS) -Wall 
 CFLAGS-GCCFPU= $(CFLAGS) -Wall -mhard-float
@@ -109,4 +108,3 @@ test51: test51.c
 test51-gcc: test51.c
 test52: test52.c
 test52-gcc: test52.c
-