diff --git a/mach/i386/libem/pmfile b/mach/i386/libem/pmfile
new file mode 100644
index 000000000..d477e8170
--- /dev/null
+++ b/mach/i386/libem/pmfile
@@ -0,0 +1,56 @@
+-- $Source$
+-- $State$
+-- $Revision$
+
+local d = ROOTDIR.."mach/i386/libem/"
+
+libem_i386 = acklibrary {
+	outputs = {"%U%/libem-%PLATFORM%.a"},
+
+	ackfile (d.."adi.s"),
+	ackfile (d.."and.s"),
+	ackfile (d.."blm.s"),
+	ackfile (d.."cii.s"),
+	ackfile (d.."cms.s"),
+	ackfile (d.."com.s"),
+	ackfile (d.."csa4.s"),
+	ackfile (d.."csb4.s"),
+	ackfile (d.."cuu.s"),
+	ackfile (d.."dup.s"),
+	ackfile (d.."dvi.s"),
+	ackfile (d.."dvu.s"),
+	ackfile (d.."error.s"),
+	ackfile (d.."exg.s"),
+	ackfile (d.."fp8087.s"),
+	ackfile (d.."fat.s"),
+	ackfile (d.."gto.s"),
+	ackfile (d.."iaar.s"),
+	ackfile (d.."ilar.s"),
+	ackfile (d.."inn.s"),
+	ackfile (d.."ior.s"),
+	ackfile (d.."isar.s"),
+	ackfile (d.."lar4.s"),
+	ackfile (d.."loi.s"),
+	ackfile (d.."mli.s"),
+	ackfile (d.."mon.s"),
+	ackfile (d.."ngi.s"),
+	ackfile (d.."nop.s"),
+	ackfile (d.."print.s"),
+	ackfile (d.."rck.s"),
+	ackfile (d.."rmi.s"),
+	ackfile (d.."rmu.s"),
+	ackfile (d.."rol.s"),
+	ackfile (d.."ror.s"),
+	ackfile (d.."sar4.s"),
+	ackfile (d.."sbi.s"),
+	ackfile (d.."set.s"),
+	ackfile (d.."sli.s"),
+	ackfile (d.."sri.s"),
+	ackfile (d.."sti.s"),
+	ackfile (d.."strhp.s"),
+	ackfile (d.."trp.s"),
+	ackfile (d.."unknown.s"),
+	ackfile (d.."xor.s"),
+
+	install = pm.install("%BINDIR%lib/%PLATFORM%/libem.a"),
+}
diff --git a/mach/i386/libend/em_end.s b/mach/i386/libend/em_end.s
index a062368da..0271f09f6 100644
--- a/mach/i386/libend/em_end.s
+++ b/mach/i386/libend/em_end.s
@@ -1,22 +1,24 @@
+! $Source$
+! $State$
+! $Revision$
+
 .sect .text
 .sect .rom
 .sect .data
 .sect .bss
-.define	endtext,enddata,endbss,__end
-.sect .text
-	.align 4
-.sect .rom
-	.align 4
-.sect .data
-	.align 4
-.sect .bss
-	.align 4
 .sect .end ! only for declaration of _end, __end and endbss.
+.define	endtext, endrom, enddata, endbss, __end
 
 	.sect .text
+	.align 4
 endtext:
+	.sect .rom
+	.align 4
+endrom:
 	.sect .data
+	.align 4
 enddata:
 	.sect .end
+	.align 4
 __end:
 endbss:
diff --git a/mach/i386/libend/pmfile b/mach/i386/libend/pmfile
new file mode 100644
index 000000000..a5ae6730c
--- /dev/null
+++ b/mach/i386/libend/pmfile
@@ -0,0 +1,16 @@
+-- $Source$
+-- $State$
+-- $Revision$
+
+local d = ROOTDIR.."mach/i386/libend/"
+
+libend_i386 = acklibrary {
+	outputs = {"%U%/libend-%PLATFORM%.a"},
+
+	ackfile (d.."edata.s"),
+	ackfile (d.."em_end.s"),
+	ackfile (d.."end.s"),
+	ackfile (d.."etext.s"),
+
+	install = pm.install("%BINDIR%lib/%PLATFORM%/libend.a"),
+}
diff --git a/mach/i386/pmfile b/mach/i386/pmfile
index 365a419e2..250bce325 100644
--- a/mach/i386/pmfile
+++ b/mach/i386/pmfile
@@ -1,26 +1,22 @@
 -- $Source$
 -- $State$
+-- $Revision$
 
 local d = ROOTDIR.."mach/i386/"
 
-include (d.."cv/pmfile")
+include (d.."libem/pmfile")
+include (d.."libend/pmfile")
 
 mach_i386 = group {
-	ARCH = "i386",
-	
 	proto_as,
 	proto_ncg { ARCHDIR = "i386" },
 	ego_descr,
-	tool_i386_cv,	
-	
-	install = pm.install("%ROOTDIR%lib/%ARCH%/descr", "%BINDIR%%PLATIND%/%ARCH%/descr"),
 }
 
--- Revision history
--- $Log$
--- Revision 1.2  2006-07-22 00:52:01  dtrg
--- Added support for the ego global optimisation suite.
---
--- Revision 1.1  2006/07/20 23:18:18  dtrg
--- First version in CVS.
---
+support_i386 = group {
+	OPTIMISATION = "-O",
+
+	libem_i386,
+	libend_i386,
+}
+