diff --git a/.gitattributes b/.gitattributes
index bcd9ac8eaae..10d55a9cbf3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2157,6 +2157,7 @@ src/mame/drivers/galaxia.c svneol=native#text/plain
 src/mame/drivers/galaxian.c svneol=native#text/plain
 src/mame/drivers/galaxold.c svneol=native#text/plain
 src/mame/drivers/galdrvr.c svneol=native#text/plain
+src/mame/drivers/galgame.c svneol=native#text/plain
 src/mame/drivers/galivan.c svneol=native#text/plain
 src/mame/drivers/galpani2.c svneol=native#text/plain
 src/mame/drivers/galpani3.c svneol=native#text/plain
diff --git a/src/mame/drivers/galgame.c b/src/mame/drivers/galgame.c
new file mode 100644
index 00000000000..809b545eed9
--- /dev/null
+++ b/src/mame/drivers/galgame.c
@@ -0,0 +1,469 @@
+/*
+
+	Galaxy Game
+
+	Driver by Mariusz Wojcieszek
+
+	First commercial video game.
+
+*/
+
+#include "emu.h"
+#include "cpu/t11/t11.h"
+
+
+#define MAX_POINTS 2048
+
+class galaxygame_state : public driver_device
+{
+public:
+	galaxygame_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag) {}
+
+	UINT16 m_clk;
+
+	UINT16 m_x;
+	UINT16 m_y;
+
+	INT16 m_mq;
+	INT16 m_ac;
+
+	struct
+	{
+		UINT16 x;
+		UINT16 y;
+	} m_point_work_list[MAX_POINTS], m_point_display_list[MAX_POINTS];
+
+	int m_point_work_list_index;
+	int m_point_display_list_index;
+	int m_interrupt;
+};
+
+/*************************************
+ *
+ *  KE11 Extended Artithmetic Element
+ *
+ *************************************/
+
+static READ16_HANDLER(ke_r)
+{
+	galaxygame_state *state = space->machine().driver_data<galaxygame_state>();
+
+	UINT16 ret;
+
+	switch( offset )
+	{
+		case 0:	// DIV
+			ret = 0;
+			break;
+		case 1: // AC
+			ret = state->m_ac;
+			break;
+		case 2: // MQ
+			ret = state->m_mq;
+			break;
+		case 7: // ASH
+			ret = 0;
+			break;
+		default:
+			ret = 0;
+			logerror("Unhandled KE read (%d)\n", offset );
+			break;
+	}
+	return ret;
+}
+
+static WRITE16_HANDLER(ke_w)
+{
+	galaxygame_state *state = space->machine().driver_data<galaxygame_state>();
+
+	switch( offset )
+	{
+		case 0: // DIV
+			{
+				if ( data != 0 )
+				{
+					INT32 dividend = (INT32)((UINT32)((UINT16)state->m_ac << 16) | (UINT16)(state->m_mq));
+					state->m_mq = dividend / (INT16)data;
+					state->m_ac = dividend % (INT16)data;
+				}
+				else
+				{
+					state->m_mq = 0;
+					state->m_ac = 0;
+				}
+			}
+			break;
+		case 1: // AC
+			state->m_ac = (INT16)data;
+			break;
+		case 2: // MQ
+			state->m_mq = (INT16)data;
+			if (state->m_mq < 0)
+			{
+				state->m_ac = -1;
+			}
+			else
+			{
+				state->m_ac = 0;
+			}
+			break;
+		case 3: // X
+			{
+				INT32 mulres = (INT32)state->m_mq*(INT32)(INT16)data;
+				state->m_ac = mulres >> 16;
+				state->m_mq = mulres & 0xffff;
+			}
+			break;
+		case 6: // LSH
+			{
+				data &= 63;
+				INT32 val = (INT32)((UINT32)((UINT16)state->m_ac << 16) | (UINT16)(state->m_mq));
+				if ( data < 32 )
+				{
+					val = val << data;
+				}
+				else
+				{
+					val = val >> (64 - data);
+				}
+				state->m_mq = val & 0xffff;
+				state->m_ac = (val >> 16) & 0xffff;
+			}
+			break;
+		case 7: // ASH
+			{
+				data &= 63;
+				INT32 val = (INT32)((UINT32)((UINT16)state->m_ac << 16) | (UINT16)(state->m_mq));
+				if ( data < 32 )
+				{
+					val = val << data;
+				}
+				else
+				{
+					val = val >> (64 - data);
+				}
+				state->m_mq = val & 0xffff;
+				state->m_ac = (val >> 16) & 0xffff;
+			}
+			break;
+		default:
+			logerror("Unhandled KE write (%d)\n", offset);
+			break;
+	}
+
+}
+
+/*************************************
+ *
+ *  Video
+ *
+ *************************************/
+
+static SCREEN_UPDATE( galaxygame )
+{
+	galaxygame_state *state = screen->machine().driver_data<galaxygame_state>();
+	bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine()));
+	for (int i = 0; i < state->m_point_display_list_index; i++ )
+	{
+		*BITMAP_ADDR16(bitmap, state->m_point_display_list[i].x >> 7, state->m_point_display_list[i].y >> 7) = 1;
+	}
+	return 0;
+}
+
+static READ16_HANDLER(x_r)
+{
+	galaxygame_state *state = space->machine().driver_data<galaxygame_state>();
+	return state->m_x;
+}
+
+static WRITE16_HANDLER(x_w)
+{
+	galaxygame_state *state = space->machine().driver_data<galaxygame_state>();
+	state->m_x = data;
+}
+
+static READ16_HANDLER(y_r)
+{
+	galaxygame_state *state = space->machine().driver_data<galaxygame_state>();
+	return state->m_y;
+}
+
+static WRITE16_HANDLER(y_w)
+{
+	galaxygame_state *state = space->machine().driver_data<galaxygame_state>();
+	state->m_y = data;
+	if ( data == 0x0101 )
+	{
+		// send points list to display device
+		// seems to happen on first 0x0101 write after interrupt
+		if ( state->m_interrupt )
+		{
+			for ( int i = 0; i < state->m_point_work_list_index ; i++ )
+			{
+				state->m_point_display_list[i].x = state->m_point_work_list[i].x;
+				state->m_point_display_list[i].y = state->m_point_work_list[i].y;
+			}
+			state->m_point_display_list_index = state->m_point_work_list_index;
+			state->m_point_work_list_index = 0;
+			state->m_interrupt = 0;
+		}
+	}
+	else
+	{
+		if ( state->m_point_work_list_index >= MAX_POINTS )
+		{
+			logerror("Work list overflow\n");
+		}
+		else
+		{
+			state->m_point_work_list[state->m_point_work_list_index].x = state->m_x;
+			state->m_point_work_list[state->m_point_work_list_index].y = state->m_y;
+			state->m_point_work_list_index++;
+		}
+	}
+}
+
+/*************************************
+ *
+ *  Inputs
+ *
+ *************************************/
+
+static INPUT_PORTS_START( galaxygame )
+	PORT_START("COINAC")
+	PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_COIN1 )
+	PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_COIN2 )
+	PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_COIN3 )
+	PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_COIN4 )
+
+	PORT_START("SR")
+	PORT_DIPNAME( 0x8000, 0x0000, "Gravity" )
+	PORT_DIPSETTING(      0x0000, "Positive Gravity" )
+	PORT_DIPSETTING(      0x8000, "Negative Gravity" )
+	PORT_DIPNAME( 0x4000, 0x0000, "Sun" )
+	PORT_DIPSETTING(      0x0000, "Sun (& Gravity)" )
+	PORT_DIPSETTING(      0x4000, "No Sun (& No Gravity)" )
+	PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
+	PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1)
+	PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
+	PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1)
+
+	PORT_DIPNAME( 0x0080, 0x0000, "Speed" )
+	PORT_DIPSETTING(      0x0000, "Slow Speed" )
+	PORT_DIPSETTING(      0x0080, "Fast Speed" )
+	PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Players ) )
+	PORT_DIPSETTING(      0x0000, "Two Players" )
+	PORT_DIPSETTING(      0x0040, "One Player" )
+	PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
+	PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
+	PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
+	PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
+INPUT_PORTS_END
+
+/*************************************
+ *
+ *  Machine
+ *
+ *************************************/
+
+static WRITE16_HANDLER(clk_w)
+{
+	galaxygame_state *state = space->machine().driver_data<galaxygame_state>();
+	state->m_clk = data;
+}
+
+static ADDRESS_MAP_START( galaxygame_map, AS_PROGRAM, 16 )
+	AM_RANGE(0x0000, 0x1fff) AM_RAM
+	AM_RANGE(0xfec0, 0xfecf) AM_READWRITE(ke_r, ke_w)
+	AM_RANGE(0xff52, 0xff53) AM_READWRITE(y_r, y_w) // 177522 Y
+	AM_RANGE(0xff54, 0xff55) AM_READ_PORT("COINAC") // 177524 COINAC
+	AM_RANGE(0xff5a, 0xff5b) AM_READWRITE(x_r, x_w)	// 177532 X
+	AM_RANGE(0xff5c, 0xff5d) AM_READ_PORT("SR")		// 177534 SR
+	AM_RANGE(0xff66, 0xff67) AM_WRITE(clk_w)		// 177546 KW11 line frequency clock
+ADDRESS_MAP_END
+
+
+static PALETTE_INIT( galaxygame )
+{
+	palette_set_color(machine,0,RGB_BLACK); /* black */
+	palette_set_color(machine,1,RGB_WHITE); /* white */
+}
+
+static IRQ_CALLBACK(galaxygame_irq_callback)
+{
+	device_set_input_line(device, 0, CLEAR_LINE);
+	return 0x40;
+}
+
+static INTERRUPT_GEN(galaxygame_irq)
+{
+	galaxygame_state *state = device->machine().driver_data<galaxygame_state>();
+	if ( state->m_clk & 0x40 )
+	{
+		device_set_input_line(device, 0, ASSERT_LINE);
+		state->m_interrupt = 1;
+	}
+}
+
+static MACHINE_RESET( galaxygame )
+{
+	galaxygame_state *state = machine.driver_data<galaxygame_state>();
+	state->m_clk = 0x00;
+	state->m_point_work_list_index = 0;
+	state->m_point_display_list_index = 0;
+	state->m_interrupt = 0;
+
+	device_set_irq_callback(machine.device("maincpu"), galaxygame_irq_callback);
+}
+
+static const struct t11_setup t11_data =
+{
+	5 << 13
+};
+
+static MACHINE_CONFIG_START( galaxygame, galaxygame_state )
+
+	MCFG_CPU_ADD("maincpu", T11, 3000000 )
+	MCFG_CPU_PROGRAM_MAP(galaxygame_map)
+	MCFG_CPU_CONFIG(t11_data)
+	MCFG_CPU_PERIODIC_INT(galaxygame_irq,60)
+
+	/* video hardware */
+	MCFG_SCREEN_ADD("screen", RASTER)
+	MCFG_SCREEN_REFRESH_RATE(60)
+	MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+	MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+	MCFG_SCREEN_SIZE(512, 512)
+	MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 511)
+	MCFG_SCREEN_UPDATE(galaxygame)
+
+	MCFG_PALETTE_LENGTH(2)
+	MCFG_PALETTE_INIT(galaxygame)
+
+	MCFG_MACHINE_RESET(galaxygame)
+MACHINE_CONFIG_END
+
+ROM_START(galgame)
+	ROM_REGION( 0x20000, "code", ROMREGION_ERASE00 )
+	ROM_LOAD( "original galaxy game listing.lst",  0x00000, 0x1efce, CRC(cd65a869) SHA1(8469313e5feaa3303ddb59c845fcdf00908973af) )	
+ROM_END
+
+/*************************************
+ *
+ *  Code loading
+ *
+ *************************************/
+
+static UINT8 read_uint16(UINT16 *pval, int pos, const UINT8* line, int linelen)
+{
+	int i;
+
+	*pval = 0;
+	if ( linelen < (pos + 6) )
+	{
+		return 0;
+	}
+
+	for ( i = 0; i < 6; i++ )
+	{
+		*pval <<= 3;
+		*pval |= line[pos + i] - 0x30;
+	}
+	return 1;
+}
+
+static UINT8 read_uint8(UINT8 *pval, int pos, const UINT8* line, int linelen)
+{
+	int i;
+
+	*pval = 0;
+	if ( linelen < (pos + 3) )
+	{
+		return 0;
+	}
+
+	for ( i = 0; i < 3; i++ )
+	{
+		*pval <<= 3;
+		*pval |= line[pos + i] - 0x30;
+	}
+	return 1;
+}
+
+static DRIVER_INIT(galaxygame)
+{
+	address_space *main = machine.device("maincpu")->memory().space(AS_PROGRAM);
+	UINT8 *code = machine.region("code")->base();
+
+	int filepos = 0, linepos, linelen;
+	UINT8 line[256];
+	UINT16 address;
+	UINT16 val;
+	UINT8 val8;
+
+	//load lst file
+	while( code[filepos] != 0 )
+	{
+		linepos = 0;
+		while( code[filepos] != 0x0d )
+		{
+			line[linepos++] = code[filepos++];
+		}
+		line[linepos] = 0;
+		filepos += 2;
+		linelen = linepos;
+
+		if ( linelen == 0 )
+		{
+			continue;
+		}
+		if ( ( line[8] != ' ' ) && read_uint16(&address, 7, line, linelen ) )
+		{
+			if ( (linelen >= 15+6) && (line[15] != ' ') )
+			{
+				read_uint16(&val, 15, line, linelen);
+				main->write_word(address, val, 0xffff);
+				address += 2;
+
+				if ( (linelen >= 22+6) && (line[22] != ' ') )
+				{
+					read_uint16(&val, 22, line, linelen);
+					main->write_word(address, val, 0xffff);
+					address += 2;
+				}
+
+				if ( (linelen >= 29+6) && (line[29] != ' ') )
+				{
+					read_uint16(&val, 29, line, linelen);
+					main->write_word(address, val, 0xffff);
+					address += 2;
+				}
+
+			}
+			else
+			{
+				if ( (linelen >= 18+3) && (line[18] != ' ') )
+				{
+					read_uint8(&val8, 18, line, linelen);
+					main->write_byte(address, val8);
+					address += 1;
+				}
+			}
+
+		}
+	}
+
+	// patch wrong code
+	main->write_word(006432, 006101); /* ROL	   R1 */
+	main->write_word(006434, 006102); /* ROL	   R2 */
+
+	// set startup code
+	main->write_word(0, 012700); /* MOV #0, R0 */
+	main->write_word(2, 0);
+	main->write_word(4, 0x8d00); /* MTPS R0 */
+	main->write_word(6, 000167); /* JMP 0500*/
+	main->write_word(8, 000500 - 10);
+}
+
+GAME(1971, galgame, 0, galaxygame, galaxygame, galaxygame, ROT270, "Computer Recreations, Inc", "Galaxy Game", GAME_NOT_WORKING | GAME_NO_SOUND_HW )
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 70ef9e76fde..50547290fe8 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -10627,6 +10627,7 @@ bingor2			// (c) 2002 Unknown
 bingor3			// (c) 2002 Unknown
 bingor4			// (c) 2002 Unknown
 bingor5			// (c) 2002 Unknown
+galgame			// (c) 1971 Computer Recreations, Inc
 
 // InterFlip / Recreativos Franco
 videopkr		// (c) 1984 InterFlip
diff --git a/src/mame/mame.mak b/src/mame/mame.mak
index 61ab2d5b8d1..513a3ef8e29 100644
--- a/src/mame/mame.mak
+++ b/src/mame/mame.mak
@@ -1714,6 +1714,7 @@ $(MAMEOBJ)/misc.a: \
 	$(DRIVERS)/freekick.o $(VIDEO)/freekick.o \
 	$(DRIVERS)/funkball.o \
 	$(DRIVERS)/galaxi.o \
+	$(DRIVERS)/galgame.o \
 	$(DRIVERS)/gamecstl.o \
 	$(DRIVERS)/gei.o \
 	$(DRIVERS)/globalfr.o \