diff --git a/src/mainboard/via/epia/Config b/src/mainboard/via/epia/Config
index 7b1cdd721c..66c7b868dd 100644
--- a/src/mainboard/via/epia/Config
+++ b/src/mainboard/via/epia/Config
@@ -7,6 +7,7 @@ mainboardinit cpu/i386/reset16.inc
 ldscript cpu/i386/reset16.lds
 
 mainboardinit superio/via/vt8231/setup_serial.inc
+mainboardinit superio/via/vt8231/setup_ethernet.inc
 mainboardinit pc80/serial.inc
 mainboardinit arch/i386/lib/console.inc
 mainboardinit northbridge/via/vt8601/raminit.inc
@@ -17,15 +18,21 @@ mainboardinit northbridge/via/vt8601/raminit.inc
 
 northbridge via/vt8601 
 southbridge via/vt8231 
-superio via/vt8231
+# kevinh - this doesn't build correctly, and I think it is just duplicating
+# the functionality of some of the early setup.
+# superio via/vt8231
 mainboardinit cpu/p6/earlymtrr.inc
 
+# The 8231 includes built in Ethernet, however it must be enabled BEFORE
+# the PCI enumeration so that it can be set up.
+option ENABLE_VT8231_LAN=1
 option ENABLE_FIXED_AND_VARIABLE_MTRRS=1
 option FINAL_MAINBOARD_FIXUP=1
 option HAVE_PIRQ_TABLE=1
 option SUPERIO_DEVFN=0x88
-object mainboard.o
+option IOAPIC=1
 object irq_tables.o
+object mainboard.o
 keyboard pc80
 cpu p5
 cpu p6
diff --git a/src/superio/via/vt8231/setup_ethernet.inc b/src/superio/via/vt8231/setup_ethernet.inc
new file mode 100644
index 0000000000..7583c0c639
--- /dev/null
+++ b/src/superio/via/vt8231/setup_ethernet.inc
@@ -0,0 +1,11 @@
+/*
+ * This early setup is a handy place to enable the Ethernet if the user wants
+ * it.
+ */
+#if ENABLE_VT8231_LAN
+enable_eth:
+	movl	CONFIG_ADDR(0, SUPERIO_DEVFN, 0x51), %eax
+	movb	$0x10, %dl
+	PCI_WRITE_CONFIG_BYTE
+#endif
+