diff --git a/src/etc/etc.sgi/Makefile.inc b/src/etc/etc.sgi/Makefile.inc
index e90aa023..53933372 100644
--- a/src/etc/etc.sgi/Makefile.inc
+++ b/src/etc/etc.sgi/Makefile.inc
@@ -1,16 +1,18 @@
-#	$OpenBSD: Makefile.inc,v 1.15 2012/03/29 20:27:53 miod Exp $
+#	$OpenBSD: Makefile.inc,v 1.16 2012/05/25 17:32:38 miod Exp $
 
-KERNELS = \
-	GENERIC-IP22 bsd.IP22 \
-	GENERIC-IP27 bsd.IP27 \
-	GENERIC-IP30 bsd.IP30 \
-	GENERIC-IP30.MP bsd.mp.IP30 \
-	GENERIC-IP32 bsd.IP32
+ALLIP=	22 27 28 30 32
+KERNELS=
+MDEXT=
+
+.for IP in ${ALLIP}
+KERNELS+=	GENERIC-IP${IP} bsd.IP${IP}
+MDEXT+=		bsd.rd.IP${IP}
+.endfor
+KERNELS+=	GENERIC-IP30.MP bsd.mp.IP30
 
 bootblocks:
 	cp ${DESTDIR}/usr/mdec/boot32 ${RELEASEDIR}
 	cp ${DESTDIR}/usr/mdec/boot64 ${RELEASEDIR}
 	cp ${DESTDIR}/usr/mdec/bootecoff ${RELEASEDIR}
 
-MDEXT=	bsd.rd.IP22 bsd.rd.IP27 bsd.rd.IP30 bsd.rd.IP32 \
-	boot32 boot64 bootecoff cd${OSrev}.iso
+MDEXT+=	boot32 boot64 bootecoff cd${OSrev}.iso
diff --git a/src/etc/etc.sgi/disktab b/src/etc/etc.sgi/disktab
index 49bab082..8814ae74 100644
--- a/src/etc/etc.sgi/disktab
+++ b/src/etc/etc.sgi/disktab
@@ -1,17 +1,17 @@
-# $OpenBSD: disktab,v 1.11 2010/07/02 20:33:54 tedu Exp $
+# $OpenBSD: disktab,v 1.12 2012/05/25 17:32:38 miod Exp $
 
 rdroot|ramdiskroot|RAM-disk root FS image:\
 	:ty=simulated:se#512:nc#20:nt#4:ns#128:\
 	:ta=4.2BSD:oa#0:pa#10240:fa#512:ba#4096:\
 	:ob#0:pb#0:oc#0:pc#10240:
 
-minicdroot|minicdramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#40:nt#4:ns#128:\
-	:ta=4.2BSD:oa#0:pa#20480:fa#512:ba#4096:\
-	:ob#0:pb#0:oc#0:pc#20480:
+minicdroot|minicdramdiskroot|Boot CD-ROM image:\
+	:ty=simulated:se#512:nc#48:nt#4:ns#128:\
+	:ta=4.2BSD:oa#0:pa#24576:fa#512:ba#4096:\
+	:ob#0:pb#0:oc#0:pc#24576:
 
-cdroot|cdramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#2048:nc#16:nt#280:ns#32:\
-	:ta=4.2BSD:oa#80:pa#143280:fa#2048:ba#16384:\
-	:ob#0:pb#0:oc#0:pc#143360:op#0:pp#80:
+cdroot|cdramdiskroot|Installation CD-ROM image:\
+	:ty=simulated:se#2048:nc#16:nt#300:ns#32:\
+	:ta=4.2BSD:oa#128:pa#153472:fa#2048:ba#16384:\
+	:ob#0:pb#0:oc#0:pc#153600:op#0:pp#128: