diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index c154a2fbcf86..371530eb0490 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -26,6 +26,8 @@
         ..
         modules
         ..
+        uboot
+        ..
         zfs
         ..
     ..
diff --git a/stand/powerpc/uboot/Makefile b/stand/powerpc/uboot/Makefile
index ccffd0ec1467..9124507397ad 100644
--- a/stand/powerpc/uboot/Makefile
+++ b/stand/powerpc/uboot/Makefile
@@ -11,6 +11,7 @@ LOADER_BZIP2_SUPPORT?=	no
 
 .include <bsd.init.mk>
 
+BINDIR= 	/boot/uboot
 PROG=		ubldr
 NEWVERSWHAT=	"U-Boot loader" ${MACHINE_ARCH}
 INSTALLFLAGS=	-b
diff --git a/usr.sbin/bsdinstall/partedit/partedit_powerpc.c b/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
index d18f2b77857d..5a3041df5b0c 100644
--- a/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
+++ b/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
@@ -94,9 +94,10 @@ bootpart_size(const char *part_type)
 		return (0);
 	if (strcmp(platform, "chrp") == 0)
 		return (800*1024);
-	if (strcmp(platform, "ps3") == 0 || strcmp(platform, "powernv") == 0 ||
-	    strcmp(platform, "mpc85xx") == 0)
+	if (strcmp(platform, "ps3") == 0 || strcmp(platform, "powernv") == 0)
 		return (512*1024*1024);
+	if (strcmp(platform, "mpc85xx") == 0)
+		return (16*1024*1024);
 	return (0);
 }
 
@@ -111,14 +112,17 @@ bootpart_type(const char *scheme, const char **mountpoint)
 		return ("prep-boot");
 	if (strcmp(platform, "powermac") == 0)
 		return ("apple-boot");
-	if (strcmp(platform, "powernv") == 0 || strcmp(platform, "ps3") == 0 ||
-	    strcmp(platform, "mpc85xx") == 0) {
+	if (strcmp(platform, "powernv") == 0 || strcmp(platform, "ps3") == 0) {
 		*mountpoint = "/boot";
 		if (strcmp(scheme, "GPT") == 0)
 			return ("ms-basic-data");
 		else if (strcmp(scheme, "MBR") == 0)
 			return ("fat32");
 	}
+	if (strcmp(platform, "mpc85xx") == 0) {
+		*mountpoint = "/boot/uboot";
+		return ("fat16");
+	}
 
 	return ("freebsd-boot");
 }