Index: boot/Makefile.build
===================================================================
--- boot/Makefile.build	(revision 4646710d9ea7943ec02c77020e7b60258fd30d8b)
+++ boot/Makefile.build	(revision 239e32b8559ac435fb7cf9f8377d70fddc986ddf)
@@ -148,14 +148,5 @@
 	$(MKARRAY) --deflate $(COMPS) $(COMP) "$(AS_PROLOG)" ".section .components, \"a\"" $^
 
-$(INITRD).img:
-ifeq ($(RDFMT),tmpfs)
-	$(MKTMPFS) $(DIST_PATH) $@
-endif
-ifeq ($(RDFMT),fat)
-	$(MKFAT) 1048576 $(DIST_PATH) $@
-endif
-ifeq ($(RDFMT),ext4fs)
-	$(MKEXT4) 1048576 $(DIST_PATH) $@
-endif
+include Makefile.initrd
 
 $(ARCH_INCLUDE): arch/$(KARCH)/include/
Index: boot/Makefile.grub
===================================================================
--- boot/Makefile.grub	(revision 4646710d9ea7943ec02c77020e7b60258fd30d8b)
+++ boot/Makefile.grub	(revision 239e32b8559ac435fb7cf9f8377d70fddc986ddf)
@@ -57,5 +57,5 @@
 endif
 
-build_dist: clean
+build_dist: clean $(COMPONENTS)
 	mkdir -p $(BOOT)
 	cp -r -L $(GRUB) $(BOOT)/grub
@@ -95,2 +95,4 @@
 clean:
 	rm -fr $(DISTROOT)
+
+include Makefile.initrd
Index: boot/Makefile.initrd
===================================================================
--- boot/Makefile.initrd	(revision 239e32b8559ac435fb7cf9f8377d70fddc986ddf)
+++ boot/Makefile.initrd	(revision 239e32b8559ac435fb7cf9f8377d70fddc986ddf)
@@ -0,0 +1,38 @@
+#
+# Copyright (c) 2006 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+$(INITRD).img:
+ifeq ($(RDFMT),tmpfs)
+	$(MKTMPFS) $(DIST_PATH) $@
+endif
+ifeq ($(RDFMT),fat)
+	$(MKFAT) 1048576 $(DIST_PATH) $@
+endif
+ifeq ($(RDFMT),ext4fs)
+	$(MKEXT4) 1048576 $(DIST_PATH) $@
+endif
Index: boot/arch/amd64/Makefile.inc
===================================================================
--- boot/arch/amd64/Makefile.inc	(revision 4646710d9ea7943ec02c77020e7b60258fd30d8b)
+++ boot/arch/amd64/Makefile.inc	(revision 239e32b8559ac435fb7cf9f8377d70fddc986ddf)
@@ -70,4 +70,3 @@
 
 BOOT_OUTPUT = $(ROOT_PATH)/image.iso
-PREBUILD = $(INITRD).img
 BUILD = Makefile.grub