diff --git a/sys/arch/macppc/stand/ofwboot/Makefile b/sys/arch/macppc/stand/ofwboot/Makefile
index cce1a8f7e22a..58e3343170d3 100644
--- a/sys/arch/macppc/stand/ofwboot/Makefile
+++ b/sys/arch/macppc/stand/ofwboot/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.34 2002/06/18 00:37:25 itojun Exp $
+#	$NetBSD: Makefile,v 1.35 2002/09/20 03:20:24 wrstuden Exp $
 
 S=	${.CURDIR}/../../../..
 
 PROG=		ofwboot
 FILES=		${PROG}.elf ${PROG}.xcf
-SRCS=		Locore.c ofdev.c hfs.c net.c netif_of.c vers.c
+SRCS=		Locore.c ofdev.c hfs.c net.c netif_of.c alloc.c vers.c
 XCOFFXTRA=	Xcoffxtra.c
 XCOFFXTRAOBJ=	Xcoffxtra.o
 CFLAGS+=	-Wno-main -msoft-float -mmultiple
diff --git a/sys/arch/macppc/stand/ofwboot/alloc.c b/sys/arch/macppc/stand/ofwboot/alloc.c
new file mode 100644
index 000000000000..1e28232aa53d
--- /dev/null
+++ b/sys/arch/macppc/stand/ofwboot/alloc.c
@@ -0,0 +1,249 @@
+/*	$NetBSD: alloc.c,v 1.3 2002/09/20 03:20:24 wrstuden Exp $	*/
+
+/*-
+ * Copyright (c) 1997 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the NetBSD
+ *	Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 FOUNDATION OR CONTRIBUTORS
+ * 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.
+ */
+
+/*
+ * Copyright (c) 1997 Christopher G. Demetriou.  All rights reserved.
+ * Copyright (c) 1996
+ *	Matthias Drochner.  All rights reserved.
+ * Copyright (C) 1995, 1996 Wolfgang Solfrank.
+ * Copyright (C) 1995, 1996 TooLs GmbH.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by TooLs GmbH.
+ * 4. The name of TooLs GmbH may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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.
+ */
+
+/*
+ * Dynamic memory allocator suitable for use with OpenFirmware.
+ *
+ * Compile options:
+ *
+ *	ALLOC_TRACE	enable tracing of allocations/deallocations
+ *
+ *	ALLOC_FIRST_FIT	use a first-fit allocation algorithm, rather than
+ *			the default best-fit algorithm.
+ *
+ *	DEBUG		enable debugging sanity checks.
+ */
+
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <lib/libsa/stand.h>
+
+#include "openfirm.h"
+
+/*
+ * Each block actually has ALIGN(struct ml) + ALIGN(size) bytes allocated
+ * to it, as follows:
+ *
+ * 0 ... (sizeof(struct ml) - 1)
+ *	allocated or unallocated: holds size of user-data part of block.
+ *
+ * sizeof(struct ml) ... (ALIGN(sizeof(struct ml)) - 1)
+ *	allocated: unused
+ *	unallocated: depends on packing of struct fl
+ *
+ * ALIGN(sizeof(struct ml)) ... (ALIGN(sizeof(struct ml)) +
+ *   ALIGN(data size) - 1)
+ *	allocated: user data
+ *	unallocated: depends on packing of struct fl
+ *
+ * 'next' is only used when the block is unallocated (i.e. on the free list).
+ * However, note that ALIGN(sizeof(struct ml)) + ALIGN(data size) must
+ * be at least 'sizeof(struct fl)', so that blocks can be used as structures
+ * when on the free list.
+ */
+
+/*
+ * Memory lists.
+ */
+struct ml {
+	unsigned	size;
+	LIST_ENTRY(ml)	list;
+};
+
+LIST_HEAD(, ml) freelist = LIST_HEAD_INITIALIZER(freelist);
+LIST_HEAD(, ml) allocatedlist = LIST_HEAD_INITIALIZER(allocatedlist);
+
+#define	OVERHEAD	ALIGN(sizeof (struct ml))	/* shorthand */
+
+void *
+alloc(size)
+	unsigned size;
+{
+	struct ml *f, *bestf;
+	unsigned bestsize = 0xffffffff;	/* greater than any real size */
+	char *help;
+	int failed;
+
+#ifdef ALLOC_TRACE
+	printf("alloc(%u)", size);
+#endif
+
+	/*
+	 * Account for overhead now, so that we don't get an
+	 * "exact fit" which doesn't have enough space.
+	 */
+	size = ALIGN(size) + OVERHEAD;
+
+#ifdef ALLOC_FIRST_FIT
+	/* scan freelist */
+	for (f = freelist.lh_first; f != NULL && f->size < size;
+	    f = f->list.le_next)
+		/* noop */ ;
+	bestf = f;
+	failed = (bestf == (struct fl *)0);
+#else
+	/* scan freelist */
+	f = freelist.lh_first;
+	while (f != NULL) {
+		if (f->size >= size) {
+			if (f->size == size)	/* exact match */
+				goto found;
+
+			if (f->size < bestsize) {
+				/* keep best fit */
+				bestf = f;
+				bestsize = f->size;
+			}
+		}
+		f = f->list.le_next;
+	}
+
+	/* no match in freelist if bestsize unchanged */
+	failed = (bestsize == 0xffffffff);
+#endif
+
+	if (failed) {	/* nothing found */
+		/*
+		 * Allocate memory from the OpenFirmware, rounded
+		 * to page size, and record the chunk size.
+		 */
+		size = roundup(size, NBPG);
+		help = OF_claim(0, size, NBPG);
+		if (help == (char *)-1)
+			panic("alloc: out of memory");
+
+		f = (struct ml *)help;
+		f->size = size;
+#ifdef ALLOC_TRACE
+		printf("=%lx (new chunk size %u)\n",
+		    (u_long)(help + OVERHEAD), f->f_size);
+#endif
+		goto out;
+	}
+
+	/* we take the best fit */
+	f = bestf;
+
+ found:
+	/* remove from freelist */
+	LIST_REMOVE(f, list);
+	help = (char *)f;
+#ifdef ALLOC_TRACE
+	printf("=%lx (origsize %u)\n", (u_long)(help + OVERHEAD), f->size);
+#endif
+ out:
+	/* place on allocated list */
+	LIST_INSERT_HEAD(&allocatedlist, f, list);
+	return (help + OVERHEAD);
+}
+
+void
+free(ptr, size)
+	void *ptr;
+	unsigned size;	/* only for consistenct check */
+{
+	register struct ml *a = (struct ml *)((char*)ptr - OVERHEAD);
+
+#ifdef ALLOC_TRACE
+	printf("free(%lx, %u) (origsize %u)\n", (u_long)ptr, size, a->size);
+#endif
+#ifdef DEBUG
+	if (size > a->size)
+		printf("free %u bytes @%lx, should be <=%u\n",
+		    size, (u_long)ptr, a->size);
+#endif
+
+	/* Remove from allocated list, place on freelist. */
+	LIST_REMOVE(a, list);
+	LIST_INSERT_HEAD(&freelist, a, list);
+}
+
+void
+freeall()
+{
+#ifdef __notyet__		/* Firmware bug ?! */
+	struct ml *m;
+
+	/* Release chunks on freelist... */
+	while ((m = freelist.lh_first) != NULL) {
+		LIST_REMOVE(m, list);
+		OF_release(m, m->size);
+	}
+
+	/* ...and allocated list. */
+	while ((m = allocatedlist.lh_first) != NULL) {
+		LIST_REMOVE(m, list);
+		OF_release(m, m->size);
+	}
+#endif /* __notyet__ */
+}