diff --git a/.gitattributes b/.gitattributes
index 6ee74365c28..cfde6a629fa 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2351,6 +2351,7 @@ src/mame/layout/funworld.lay svneol=native#text/plain
 src/mame/layout/geebee.lay svneol=native#text/plain
 src/mame/layout/gldncrwn.lay svneol=native#text/plain
 src/mame/layout/goldnpkr.lay svneol=native#text/plain
+src/mame/layout/gorf.lay svneol=native#text/plain
 src/mame/layout/gypsyjug.lay svneol=native#text/plain
 src/mame/layout/invad2ct.lay svneol=native#text/plain
 src/mame/layout/invaders.lay svneol=native#text/plain
diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c
index 020516baf40..9eb04312a08 100644
--- a/src/mame/drivers/astrocde.c
+++ b/src/mame/drivers/astrocde.c
@@ -118,6 +118,7 @@
 #include "sound/astrocde.h"
 #include "sound/ay8910.h"
 #include "tenpindx.lh"
+#include "gorf.lh"
 
 
 static UINT8 *protected_ram;
@@ -1783,8 +1784,8 @@ GAME( 1980, spacezap, 0,    spacezap, spacezap, spacezap, ROT0,   "Midway", "Spa
 GAME( 1980, wow,      0,    wow,      wow,      wow,      ROT0,   "Midway", "Wizard of Wor", GAME_SUPPORTS_SAVE )
 
 /* 91354 CPU board + 90708 game board + 91356 RAM board + 91355 pattern board + 91364 ROM/RAM board */
-GAME( 1981, gorf,     0,    gorf,     gorf,     gorf,     ROT270, "Midway", "Gorf", GAME_SUPPORTS_SAVE )
-GAME( 1981, gorfpgm1, gorf, gorf,     gorf,     gorf,     ROT270, "Midway", "Gorf (Program 1)", GAME_SUPPORTS_SAVE )
+GAMEL(1981, gorf,     0,    gorf,     gorf,     gorf,     ROT270, "Midway", "Gorf", GAME_SUPPORTS_SAVE, layout_gorf  )
+GAMEL(1981, gorfpgm1, gorf, gorf,     gorf,     gorf,     ROT270, "Midway", "Gorf (Program 1)", GAME_SUPPORTS_SAVE, layout_gorf )
 
 /* 91354 CPU board + 90708 game board + 91356 RAM board + 91355 pattern board + 91423 memory board */
 GAME( 1981, robby,    0,    robby,    robby,    robby,    ROT0,   "Bally Midway", "Robby Roto", GAME_SUPPORTS_SAVE )
diff --git a/src/mame/layout/gorf.lay b/src/mame/layout/gorf.lay
new file mode 100644
index 00000000000..57b469b55f7
--- /dev/null
+++ b/src/mame/layout/gorf.lay
@@ -0,0 +1,170 @@
+<mamelayout version="2">
+	<element name="white">
+		<rect>
+			<color red="1.0" green="1.0" blue="1.0" />
+		</rect>
+	</element>
+	<element name="yellow">
+		<rect>
+			<color red="1.0" green="0.85" blue="0" />
+		</rect>
+	</element>
+	<element name="black">
+		<rect>
+			<color red="0" green="0" blue="0" />
+		</rect>
+	</element>
+	<element name="lamp" defstate="0">
+		<rect state="1">
+			<color red="1.0" green="0.85" blue="0.0" />
+		</rect>
+	</element>
+	<element name="spacetext">
+		<text string="SPACE">
+			<color red="0" green="0" blue="0" />
+		</text> 
+	</element>
+	<element name="rank">
+		<text string="SPACE RANK">
+			<color red="0" green="0" blue="0" />
+		</text> 
+	</element>
+	<element name="cadet">
+		<text string="CADET">
+			<color red="0" green="0" blue="0" />
+		</text> 
+	</element>
+	<element name="captain">
+		<text string="CAPTAIN">
+			<color red="0" green="0" blue="0" />
+		</text> 
+	</element>
+	<element name="colonel">
+		<text string="COLONEL">
+			<color red="0" green="0" blue="0" />
+		</text> 
+	</element>
+	<element name="general">
+		<text string="GENERAL">
+			<color red="0" green="0" blue="0" />
+		</text> 
+	</element>
+	<element name="warrior">
+		<text string="WARRIOR">
+			<color red="0" green="0" blue="0" />
+		</text> 
+	</element>
+	<element name="avenger">
+		<text string="AVENGER">
+			<color red="0" green="0" blue="0" />
+		</text> 
+	</element>
+	<view name="Lamps">
+		<bounds x="-112" y="0" width="524" height="400" />
+		<screen index="0">
+			<bounds x="0" y="0" width="300" height="400" />
+		</screen>
+		<bezel element="white">
+			<bounds x="324" y="213" width="88" height="180" />
+		</bezel>
+		<bezel element="rank">
+			<bounds x="330" y="214" width="76" height="10" />
+		</bezel>
+		<bezel element="black">
+			<bounds x="328" y="227" width="38" height="50" />
+		</bezel>
+		<bezel element="black">
+			<bounds x="370" y="227" width="38" height="50" />
+		</bezel>
+		<bezel element="black">
+			<bounds x="328" y="283" width="38" height="50" />
+		</bezel>
+		<bezel element="black">
+			<bounds x="370" y="283" width="38" height="50" />
+		</bezel>
+		<bezel element="black">
+			<bounds x="328" y="339" width="38" height="50" />
+		</bezel>
+		<bezel element="black">
+			<bounds x="370" y="339" width="38" height="50" />
+		</bezel>
+		<bezel name="lamp0" element="lamp">
+            		<bounds x="332" y="234" width="30" height="36" />
+		</bezel>
+		<bezel name="lamp1" element="lamp">
+            		<bounds x="374" y="234" width="30" height="36" />
+		</bezel>
+		<bezel name="lamp2" element="lamp">
+            		<bounds x="332" y="290" width="30" height="36" />
+		</bezel>
+		<bezel name="lamp3" element="lamp">
+            		<bounds x="374" y="290" width="30" height="36" />
+		</bezel>
+		<bezel name="lamp4" element="lamp">
+            		<bounds x="332" y="346" width="30" height="36" />
+		</bezel>
+		<bezel name="lamp5" element="lamp">
+            		<bounds x="374" y="346" width="30" height="36" />
+		</bezel>
+		<bezel element="yellow">
+            		<bounds x="332" y="234" width="30" height="36" />
+			<color alpha=".5" />
+		</bezel>
+		<bezel element="yellow">
+            		<bounds x="374" y="234" width="30" height="36" />
+			<color alpha=".5" />
+		</bezel>
+		<bezel element="yellow">
+            		<bounds x="332" y="290" width="30" height="36" />
+			<color alpha=".5" />
+		</bezel>
+		<bezel element="yellow">
+            		<bounds x="374" y="290" width="30" height="36" />
+			<color alpha=".5" />
+		</bezel>
+		<bezel element="yellow">
+            		<bounds x="332" y="346" width="30" height="36" />
+			<color alpha=".5" />
+		</bezel>
+		<bezel element="yellow">
+            		<bounds x="374" y="346" width="30" height="36" />
+			<color alpha=".5" />
+		</bezel>
+		<bezel element="spacetext">
+			<bounds x="332" y="244" width="30" height="7" />
+		</bezel>
+		<bezel element="cadet">
+			<bounds x="332" y="251" width="30" height="7" />
+		</bezel>
+		<bezel element="spacetext">
+			<bounds x="374" y="244" width="30" height="7" />
+		</bezel>
+		<bezel element="captain">
+			<bounds x="374" y="251" width="30" height="7" />
+		</bezel>
+		<bezel element="spacetext">
+			<bounds x="332" y="300" width="30" height="7" />
+		</bezel>
+		<bezel element="colonel">
+			<bounds x="332" y="307" width="30" height="7" />
+		</bezel>
+		<bezel element="spacetext">
+			<bounds x="374" y="300" width="30" height="7" />
+		</bezel>
+		<bezel element="general">
+			<bounds x="374" y="307" width="30" height="7" />
+		</bezel>
+		<bezel element="spacetext">
+			<bounds x="332" y="356" width="30" height="7" />
+		</bezel>
+		<bezel element="warrior">
+			<bounds x="332" y="363" width="30" height="7" />
+		</bezel>
+		<bezel element="spacetext">
+			<bounds x="374" y="356" width="30" height="7" />
+		</bezel>
+		<bezel element="avenger">
+			<bounds x="374" y="363" width="30" height="7" />
+		</bezel>
+	</view>
+</mamelayout>
\ No newline at end of file
diff --git a/src/mame/mame.mak b/src/mame/mame.mak
index 4bf056a725f..432c0e59577 100644
--- a/src/mame/mame.mak
+++ b/src/mame/mame.mak
@@ -1642,7 +1642,8 @@ $(DRIVERS)/acefruit.o:	$(LAYOUT)/sidewndr.lh
 $(DRIVERS)/ampoker2.o:	$(LAYOUT)/ampoker2.lh \
 						$(LAYOUT)/sigmapkr.lh \
 
-$(DRIVERS)/astrocde.o:	$(LAYOUT)/tenpindx.lh
+$(DRIVERS)/astrocde.o:	$(LAYOUT)/gorf.lh \
+						$(LAYOUT)/tenpindx.lh
 
 $(DRIVERS)/atarifb.o:	$(LAYOUT)/atarifb.lh \
 						$(LAYOUT)/atarifb4.lh \