diff --git a/gnome/Makefile b/gnome/Makefile
index 1f13d3c..7a3c85e 100644
--- a/gnome/Makefile
+++ b/gnome/Makefile
@@ -1,8 +1,4 @@
 
-ifneq ($(OVERLAY),YES)
-	DO_OVERLAY = \#
-endif
-
 # totem gst-inspect requires a machine id (generated by dbus). we
 # don't have one yet because we are in a virgin chroot. fake one
 preinstall:
@@ -10,19 +6,20 @@ preinstall:
 	echo 1234567890abcdef1234567890abcdef > \
 		"$(CHROOT)"/var/lib/dbus/machine-id
 	chroot "$(CHROOT)" $(EMERGE) $(USEPKG) -1n dev-util/pkgconfig
-	$(DO_OVERLAY) chroot $(CHROOT) $(EMERGE) $(USEPKG) -1n app-portage/layman
-	$(DO_OVERLAY) chroot $(CHROOT) $(EMERGE) $(USEPKG) -1n dev-vcs/git
-	$(DO_OVERLAY) chroot $(CHROOT) /usr/bin/layman --sync ALL
-	$(DO_OVERLAY) chroot $(CHROOT) /usr/bin/layman --add gnome
-	$(DO_OVERLAY) echo "source /var/lib/layman/make.conf" >> $(CHROOT)/etc/make.conf
-	$(DO_OVERLAY) echo USE='"$$USE clutter"' >> $(CHROOT)/etc/make.conf
+ifeq ($(OVERLAY),YES)
+	chroot $(CHROOT) $(EMERGE) $(USEPKG) -1n app-portage/layman
+	chroot $(CHROOT) $(EMERGE) $(USEPKG) -1n dev-vcs/git
+	chroot $(CHROOT) /usr/bin/layman --sync ALL
+	chroot $(CHROOT) /usr/bin/layman --add gnome
+	echo "source /var/lib/layman/make.conf" >> $(CHROOT)/etc/make.conf
+	echo USE='"$$USE clutter"' >> $(CHROOT)/etc/make.conf
+endif
 
-postinstall: custom.conf
+postinstall: custom.conf gdm.start
 	$(RM) "$(CHROOT)"/var/lib/dbus/machine-id
 	cp custom.conf "$(CHROOT)"/etc/X11/gdm/custom.conf
-	#chroot "$(CHROOT)" rc-update add hald default
-	chroot "$(CHROOT)" rc-update add dbus default
-	echo 'gdm &>/dev/null' >> "$(CHROOT)"/etc/conf.d/local.start
+	ln -sf /etc/init.d/dbus "$(CHROOT)/etc/runlevels/default/dbus"
+	cp gdm.start "$(CHROOT)/etc/local.d/gdm.start"
 
 clean: