diff --git a/hash/neogeo.xml b/hash/neogeo.xml
index 06ed24faa76..1146b899ed4 100644
--- a/hash/neogeo.xml
+++ b/hash/neogeo.xml
@@ -7951,6 +7951,53 @@
 		</part>
 	</software>
 
+	<software name="garouha" cloneof="garou">
+		<description>Garou - Mark of the Wolves (NGH-2530)</description>
+		<year>1999</year>
+		<publisher>SNK</publisher>
+		<info name="serial" value="NGM-2530"/>
+		<info name="release" value="19991126"/>
+		<info name="alt_title" value="餓狼"/>
+		<sharedfeat name="release" value="AES" />
+		<sharedfeat name="compatibility" value="MVS,AES" />
+		<part name="cart" interface="neo_cart">
+			<!-- later revision -->
+			<feature name="slot" value="sma_garou" />
+			<dataarea name="maincpu" width="16" endianness="big" size="0x900000">
+				<rom loadflag="load16_word_swap" name="neo-sma" offset="0x0c0000" size="0x040000" crc="9aa450e6" sha1="ba9c6fe10ef97255b004fcbf05065826d219a968" />
+				<!-- stored in the custom chip -->
+				<rom loadflag="load16_word_swap" name="253-ep1.p1" offset="0x100000" size="0x200000" crc="ea3171a4" sha1="bbda40f652baa0dc5fc6a006c001a1bdb0df43f6" />  <!-- M27C160 -->
+				<rom loadflag="load16_word_swap" name="253-ep2.p2" offset="0x300000" size="0x200000" crc="382f704b" sha1="0ace9c84a8b8a0524fd9a503e7d872de1bf1bd52" />  <!-- M27C160 -->
+				<rom loadflag="load16_word_swap" name="253-ep3.p3" offset="0x500000" size="0x200000" crc="e395bfdd" sha1="6b50f5ac15bf66b7e4e9bff57594fd3d7530c831" />  <!-- M27C160 -->
+				<rom loadflag="load16_word_swap" name="253-ep4.p4" offset="0x700000" size="0x200000" crc="da92c08e" sha1="5556f983ebcebc33160e90a6a6cf589d54c8cedc" />  <!-- M27C160 -->
+			</dataarea>
+			<dataarea name="fixed" size="0x80000">
+				<!-- The Encrypted Boards do _not_ have an s1 rom, data for it comes from the Cx ROMs -->
+				<rom value="0" size="0x80000" offset="0x000000" loadflag="fill" />
+			</dataarea>
+			<dataarea name="audiocpu" size="0x040000">
+				<rom offset="0x000000" size="0x040000" name="253-m1.m1" crc="36a806be" sha1="90fb44dc0c3fb57946a0f35716056abb84a0f191" />   <!-- TC532000 -->
+			</dataarea>
+			<dataarea name="ymsnd" size="0x1000000">
+				<rom name="253-v1.v1" offset="0x000000" size="0x400000" crc="263e388c" sha1="11f05feee170370c4bfc5053af79246a6e3de5dc" />   <!-- TC5332204 -->
+				<rom name="253-v2.v2" offset="0x400000" size="0x400000" crc="2c6bc7be" sha1="c9c61054ce1a47bf1bf77a31117726b499df24a4" />   <!-- TC5332204 -->
+				<rom name="253-v3.v3" offset="0x800000" size="0x400000" crc="0425b27d" sha1="986863c98fc3445487242dcf2ea75b075e7f33ee" />   <!-- TC5332204 -->
+				<rom name="253-v4.v4" offset="0xc00000" size="0x400000" crc="a54be8a9" sha1="d7123e79b43e8adfaa5ecadbfcbeb6be890ec311" />   <!-- TC5332204 -->
+			</dataarea>
+			<dataarea name="sprites" size="0x4000000">
+				<!-- Encrypted -->
+				<rom loadflag="load16_byte" name="253-c1.c1" offset="0x000000" size="0x800000" crc="0603e046" sha1="5ef4557ce90ba65d36129de97be1fdc049c4a3d0" />    <!-- TC5364205 -->
+				<rom loadflag="load16_byte" name="253-c2.c2" offset="0x000001" size="0x800000" crc="0917d2a4" sha1="d4ed3a13ae22f880fb399671c1752f1a0283f316" />    <!-- TC5364205 -->
+				<rom loadflag="load16_byte" name="253-c3.c3" offset="0x1000000" size="0x800000" crc="6737c92d" sha1="678f0c9cc1267bd131546981b9989bfb7289d8ba" />   <!-- TC5364205 -->
+				<rom loadflag="load16_byte" name="253-c4.c4" offset="0x1000001" size="0x800000" crc="5ba92ec6" sha1="aae36b050a3a0321026a96eba06dd184c0e2acca" />   <!-- TC5364205 -->
+				<rom loadflag="load16_byte" name="253-c5.c5" offset="0x2000000" size="0x800000" crc="3eab5557" sha1="47c433015aa81a0b0a1d3ee51382c4948b80c023" />   <!-- TC5364205 -->
+				<rom loadflag="load16_byte" name="253-c6.c6" offset="0x2000001" size="0x800000" crc="308d098b" sha1="b052f1fa9fbc69606004c250e2505360eaa24949" />   <!-- TC5364205 -->
+				<rom loadflag="load16_byte" name="253-c7.c7" offset="0x3000000" size="0x800000" crc="c0e995ae" sha1="8675ca787d28246174c313167f82557f021366fc" />   <!-- TC5364205 -->
+				<rom loadflag="load16_byte" name="253-c8.c8" offset="0x3000001" size="0x800000" crc="21a11303" sha1="fd61221ad257c185ef5c1f9694bd6b840b591af3" />   <!-- TC5364205 -->
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="garoup" cloneof="garou">
 		<description>Garou - Mark of the Wolves (prototype)</description>
 		<year>1999</year>
@@ -8797,7 +8844,41 @@
 	-->
 
 	<software name="pnyaa">
-		<description>Pochi and Nyaa</description>
+		<description>Pochi and Nyaa (Ver 2.02)</description>
+		<year>2003</year>
+		<publisher>Aiky / Taito</publisher>
+		<info name="serial" value="NGM-2670"/>
+		<info name="release" value="20031224"/>
+		<info name="alt_title" value="ポチッとにゃ～"/>
+		<sharedfeat name="release" value="MVS" />   <!-- MVS ONLY RELEASE -->
+		<sharedfeat name="compatibility" value="MVS,AES" />
+		<part name="cart" interface="neo_cart">
+			<feature name="slot" value="pcm2_pnyaa" />
+			<dataarea name="maincpu" width="16" endianness="big" size="0x100000">
+				<rom loadflag="load16_word_swap" name="pn202.p1" offset="0x000000" size="0x100000" crc="bf34e71c" sha1="cfa7a2c7c41601a758414faf34e59583d7537363" />
+			</dataarea>
+			<dataarea name="fixed" size="0x20000">
+				<!-- The Encrypted Boards do _not_ have an s1 rom, data for it comes from the Cx ROMs -->
+				<rom value="0" size="0x20000" offset="0x000000" loadflag="fill" />
+			</dataarea>
+				<!-- Encrypted -->
+			<dataarea name="audiocrypt" size="0x80000">
+				<rom offset="0x00000" size="0x80000" name="267-m1.m1" crc="c7853ccd" sha1="1b7a4c5093cf0fe3861ce44fd1d3b30c71ad0abe" /> <!-- mask rom TC534000 -->
+			</dataarea>
+			<dataarea name="ymsnd" size="0x400000">
+				<!-- Encrypted -->
+				<rom name="267-v1.v1" offset="0x000000" size="0x400000" crc="e2e8e917" sha1="7f412d55aebff3d38a225a88c632916295ab0584" />   <!-- mask rom TC5332204 -->
+			</dataarea>
+			<dataarea name="sprites" size="0x1000000">
+				<!-- Encrypted -->
+				<rom loadflag="load16_byte" name="267-c1.c1" offset="0x000000" size="0x800000" crc="5eebee65" sha1="7eb3eefdeb24e19831d0f51d4ea07a0292c25ab6" />    <!-- mask rom TC5364205 -->
+				<rom loadflag="load16_byte" name="267-c2.c2" offset="0x000001" size="0x800000" crc="2b67187b" sha1="149c3efd3c444fd0d35a97fa2268102bf76be3ed" />    <!-- mask rom TC5364205 -->
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="pnyaaa" cloneof="pnyaa">
+		<description>Pochi and Nyaa (Ver 2.00)</description>
 		<year>2003</year>
 		<publisher>Aiky / Taito</publisher>
 		<info name="serial" value="NGM-2670"/>
@@ -8829,8 +8910,7 @@
 			</dataarea>
 		</part>
 	</software>
-
-
+	
 	<!--
 	ID-0268
 	. NGM-2680
diff --git a/src/mame/drivers/neogeo.cpp b/src/mame/drivers/neogeo.cpp
index 1bd2aa66b62..abb71a45fae 100644
--- a/src/mame/drivers/neogeo.cpp
+++ b/src/mame/drivers/neogeo.cpp
@@ -8564,6 +8564,43 @@ ROM_START( garouh ) /* Original Version - Encrypted GFX */ /* MVS AND AES VERSIO
 	ROM_LOAD16_BYTE( "253-c8.c8", 0x3000001, 0x800000, CRC(21a11303) SHA1(fd61221ad257c185ef5c1f9694bd6b840b591af3) ) /* Plane 2,3 */ /* TC5364205 */
 ROM_END
 
+ROM_START( garouha ) /* Original Version - Encrypted GFX */ /* AES VERSION */
+	ROM_REGION( 0x900000, "cslot1:maincpu", ROMREGION_BE|ROMREGION_16BIT )
+	ROM_LOAD16_WORD_SWAP( "neo-sma", 0x0c0000, 0x040000, CRC(9aa450e6) SHA1(ba9c6fe10ef97255b004fcbf05065826d219a968) )  /* stored in the custom chip */
+	/* standard program roms are identical to 'garou' set, only content of custom chip above differs */
+	ROM_LOAD16_WORD_SWAP( "253-ep1.p1", 0x100000, 0x200000, CRC(ea3171a4) SHA1(bbda40f652baa0dc5fc6a006c001a1bdb0df43f6) ) /* M27C160 */
+	ROM_LOAD16_WORD_SWAP( "253-ep2.p2", 0x300000, 0x200000, CRC(382f704b) SHA1(0ace9c84a8b8a0524fd9a503e7d872de1bf1bd52) ) /* M27C160 */
+	ROM_LOAD16_WORD_SWAP( "253-ep3.p3", 0x500000, 0x200000, CRC(e395bfdd) SHA1(6b50f5ac15bf66b7e4e9bff57594fd3d7530c831) ) /* M27C160 */
+	ROM_LOAD16_WORD_SWAP( "253-ep4.p4", 0x700000, 0x200000, CRC(da92c08e) SHA1(5556f983ebcebc33160e90a6a6cf589d54c8cedc) ) /* M27C160 */
+
+	ROM_Y_ZOOM
+
+	/* The Encrypted Boards do not have an s1 rom, data for it comes from the Cx ROMs */
+	ROM_REGION( 0x80000, "cslot1:fixed", 0 )   /* larger char set */
+	ROM_FILL( 0x000000, 0x20000, 0x000000 )
+	ROM_REGION( 0x20000, "fixedbios", 0 )
+	ROM_LOAD( "sfix.sfix", 0x000000, 0x20000, CRC(c2ea0cfd) SHA1(fd4a618cdcdbf849374f0a50dd8efe9dbab706c3) )
+
+	NEO_BIOS_AUDIO_256K( "253-m1.m1", CRC(36a806be) SHA1(90fb44dc0c3fb57946a0f35716056abb84a0f191) ) /* TC532000 */
+
+	ROM_REGION( 0x1000000, "cslot1:ymsnd", 0 )
+	ROM_LOAD( "253-v1.v1", 0x000000, 0x400000, CRC(263e388c) SHA1(11f05feee170370c4bfc5053af79246a6e3de5dc) ) /* TC5332204 */
+	ROM_LOAD( "253-v2.v2", 0x400000, 0x400000, CRC(2c6bc7be) SHA1(c9c61054ce1a47bf1bf77a31117726b499df24a4) ) /* TC5332204 */
+	ROM_LOAD( "253-v3.v3", 0x800000, 0x400000, CRC(0425b27d) SHA1(986863c98fc3445487242dcf2ea75b075e7f33ee) ) /* TC5332204 */
+	ROM_LOAD( "253-v4.v4", 0xc00000, 0x400000, CRC(a54be8a9) SHA1(d7123e79b43e8adfaa5ecadbfcbeb6be890ec311) ) /* TC5332204 */
+
+	ROM_REGION( 0x4000000, "cslot1:sprites", 0 )
+	/* Encrypted */
+	ROM_LOAD16_BYTE( "253-c1.c1", 0x0000000, 0x800000, CRC(0603e046) SHA1(5ef4557ce90ba65d36129de97be1fdc049c4a3d0) ) /* Plane 0,1 */ /* TC5364205 */
+	ROM_LOAD16_BYTE( "253-c2.c2", 0x0000001, 0x800000, CRC(0917d2a4) SHA1(d4ed3a13ae22f880fb399671c1752f1a0283f316) ) /* Plane 2,3 */ /* TC5364205 */
+	ROM_LOAD16_BYTE( "253-c3.c3", 0x1000000, 0x800000, CRC(6737c92d) SHA1(678f0c9cc1267bd131546981b9989bfb7289d8ba) ) /* Plane 0,1 */ /* TC5364205 */
+	ROM_LOAD16_BYTE( "253-c4.c4", 0x1000001, 0x800000, CRC(5ba92ec6) SHA1(aae36b050a3a0321026a96eba06dd184c0e2acca) ) /* Plane 2,3 */ /* TC5364205 */
+	ROM_LOAD16_BYTE( "253-c5.c5", 0x2000000, 0x800000, CRC(3eab5557) SHA1(47c433015aa81a0b0a1d3ee51382c4948b80c023) ) /* Plane 0,1 */ /* TC5364205 */
+	ROM_LOAD16_BYTE( "253-c6.c6", 0x2000001, 0x800000, CRC(308d098b) SHA1(b052f1fa9fbc69606004c250e2505360eaa24949) ) /* Plane 2,3 */ /* TC5364205 */
+	ROM_LOAD16_BYTE( "253-c7.c7", 0x3000000, 0x800000, CRC(c0e995ae) SHA1(8675ca787d28246174c313167f82557f021366fc) ) /* Plane 0,1 */ /* TC5364205 */
+	ROM_LOAD16_BYTE( "253-c8.c8", 0x3000001, 0x800000, CRC(21a11303) SHA1(fd61221ad257c185ef5c1f9694bd6b840b591af3) ) /* Plane 2,3 */ /* TC5364205 */
+ROM_END
+
 ROM_START( garoup ) /* Prototype Version, seems genuine */
 	ROM_REGION( 0x500000, "cslot1:maincpu", ROMREGION_BE|ROMREGION_16BIT )
 	ROM_LOAD16_WORD_SWAP( "proto_253-p1.p1", 0x000000, 0x100000, CRC(c72f0c16) SHA1(1ff6bb651682f93bef9ff02622c3cf63fe594986) )
@@ -9239,9 +9276,33 @@ ROM_END
 ****************************************/
 
 ROM_START( pnyaa ) /* Encrypted Set */ /* MVS ONLY RELEASE */
+	ROM_REGION( 0x100000, "cslot1:maincpu", ROMREGION_BE|ROMREGION_16BIT )
+	ROM_LOAD16_WORD_SWAP( "pn202.p1", 0x000000, 0x100000, CRC(bf34e71c) SHA1(cfa7a2c7c41601a758414faf34e59583d7537363) )
+
+	ROM_Y_ZOOM
+
+	/* The Encrypted Boards do not have an s1 rom, data for it comes from the Cx ROMs */
+	ROM_REGION( 0x20000, "cslot1:fixed", 0 )
+	ROM_FILL( 0x000000, 0x20000, 0x000000 )
+	ROM_REGION( 0x20000, "fixedbios", 0 )
+	ROM_LOAD( "sfix.sfix", 0x000000, 0x20000, CRC(c2ea0cfd) SHA1(fd4a618cdcdbf849374f0a50dd8efe9dbab706c3) )
+
+	/* Encrypted */
+	NEO_BIOS_AUDIO_ENCRYPTED_512K( "267-m1.m1", CRC(c7853ccd) SHA1(1b7a4c5093cf0fe3861ce44fd1d3b30c71ad0abe) ) /* mask rom TC534000 */
+
+	ROM_REGION( 0x400000, "cslot1:ymsnd", 0 )
+	/* Encrypted */
+	ROM_LOAD( "267-v1.v1", 0x000000, 0x400000, CRC(e2e8e917) SHA1(7f412d55aebff3d38a225a88c632916295ab0584) ) /* mask rom TC5332204 */
+
+	ROM_REGION( 0x1000000, "cslot1:sprites", 0 )
+	/* Encrypted */
+	ROM_LOAD16_BYTE( "267-c1.c1", 0x0000000, 0x800000, CRC(5eebee65) SHA1(7eb3eefdeb24e19831d0f51d4ea07a0292c25ab6) ) /* Plane 0,1 */ /* mask rom TC5364205 */
+	ROM_LOAD16_BYTE( "267-c2.c2", 0x0000001, 0x800000, CRC(2b67187b) SHA1(149c3efd3c444fd0d35a97fa2268102bf76be3ed) ) /* Plane 2,3 */ /* mask rom TC5364205 */
+ROM_END
+
+ROM_START( pnyaaa ) /* Encrypted Set */ /* MVS ONLY RELEASE */
 	ROM_REGION( 0x100000, "cslot1:maincpu", ROMREGION_BE|ROMREGION_16BIT )
 	ROM_LOAD16_WORD_SWAP( "267-p1.p1", 0x000000, 0x100000, CRC(112fe2c0) SHA1(01420e051f0bdbd4f68ce306a3738161b96f8ba8) ) /* mask rom TC538200 */
-	/* also found set with p1 and m1 on eprom with sticker; chip labels is PN 2.02 and M1 */
 
 	ROM_Y_ZOOM
 
@@ -11267,6 +11328,7 @@ ROM_END
 
 //    YEAR  NAME        PARENT    MACHINE    INPUT     STATE           INIT  MONITOR
 // SNK
+
 GAME( 1990, nam1975,    neogeo,   neobase,   neogeo,    mvs_led_state,  0,    ROT0, "SNK", "NAM-1975 (NGM-001 ~ NGH-001)", MACHINE_SUPPORTS_SAVE )
 GAME( 1990, bstars,     neogeo,   neobase,   neogeo,    mvs_led_state,  0,    ROT0, "SNK", "Baseball Stars Professional (NGM-002)", MACHINE_SUPPORTS_SAVE )
 GAME( 1990, bstarsh,    bstars,   neobase,   neogeo,    mvs_led_state,  0,    ROT0, "SNK", "Baseball Stars Professional (NGH-002)", MACHINE_SUPPORTS_SAVE )
@@ -11383,6 +11445,7 @@ GAME( 1999, kof99ka,    kof99,    kof99k,    neogeo,    mvs_led_state,  0,    RO
 GAME( 1999, kof99p,     kof99,    neobase,   neogeo,    mvs_led_state,  0,    ROT0, "SNK", "The King of Fighters '99 - Millennium Battle (prototype)", MACHINE_SUPPORTS_SAVE )
 GAME( 1999, garou,      neogeo,   garou,     neogeo,    mvs_led_state,  0,    ROT0, "SNK", "Garou - Mark of the Wolves (NGM-2530)" , MACHINE_SUPPORTS_SAVE ) /* Encrypted Code & GFX */
 GAME( 1999, garouh,     garou,    garouh,    neogeo,    mvs_led_state,  0,    ROT0, "SNK", "Garou - Mark of the Wolves (NGM-2530 ~ NGH-2530)" , MACHINE_SUPPORTS_SAVE ) /* Encrypted Code & GFX */
+GAME( 1999, garouha,    garou,    garou,     neogeo,    mvs_led_state,  0,    ROT0, "SNK", "Garou - Mark of the Wolves (NGH-2530)" , MACHINE_SUPPORTS_SAVE ) /* Encrypted Code & GFX */
 GAME( 1999, garoup,     garou,    neobase,   neogeo,    mvs_led_state,  0,    ROT0, "SNK", "Garou - Mark of the Wolves (prototype)", MACHINE_SUPPORTS_SAVE )
 GAME( 1999, garoubl,    garou,    garoubl,   neogeo,    mvs_led_state,  0,    ROT0, "bootleg", "Garou - Mark of the Wolves (bootleg)", MACHINE_SUPPORTS_SAVE ) /* Bootleg of garoup */
 GAME( 2000, mslug3,     neogeo,   mslug3,    neogeo,    mvs_led_state,  0,    ROT0, "SNK", "Metal Slug 3 (NGM-2560)" , MACHINE_SUPPORTS_SAVE ) /* Encrypted Code & GFX */
@@ -11520,7 +11583,8 @@ GAME( 1996, wakuwak7,   neogeo,   neobase,   neogeo,    mvs_led_state,  0,    RO
 GAME( 1994, pbobblen,   neogeo,   neobase,   neogeo,    mvs_led_state,  0,    ROT0, "Taito", "Puzzle Bobble / Bust-A-Move (Neo-Geo, NGM-083)", MACHINE_SUPPORTS_SAVE )
 GAME( 1994, pbobblenb,  pbobblen, neobase,   neogeo,    mvs_led_state,  0,    ROT0, "bootleg", "Puzzle Bobble / Bust-A-Move (Neo-Geo, bootleg)", MACHINE_SUPPORTS_SAVE )
 GAME( 1999, pbobbl2n,   neogeo,   neobase,   neogeo,    mvs_led_state,  0,    ROT0, "Taito (SNK license)", "Puzzle Bobble 2 / Bust-A-Move Again (Neo-Geo)", MACHINE_SUPPORTS_SAVE )
-GAME( 2003, pnyaa,      neogeo,   pnyaa,     neogeo,    mvs_led_state,  0,    ROT0, "Aiky / Taito", "Pochi and Nyaa", MACHINE_SUPPORTS_SAVE )
+GAME( 2003, pnyaa,      neogeo,   pnyaa,     neogeo,    mvs_led_state,  0,    ROT0, "Aiky / Taito", "Pochi and Nyaa (Ver 2.02)", MACHINE_SUPPORTS_SAVE ) // this version does not show the web address on the title screen
+GAME( 2003, pnyaaa,     pnyaa,    pnyaa,     neogeo,    mvs_led_state,  0,    ROT0, "Aiky / Taito", "Pochi and Nyaa (Ver 2.00)", MACHINE_SUPPORTS_SAVE )
 
 // Takara
 GAME( 1995, marukodq,   neogeo,   neobase,   neogeo,    mvs_led_state,  0,    ROT0, "Takara", "Chibi Marukochan Deluxe Quiz", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index c43882be26e..dcbb09bfb12 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -29627,6 +29627,7 @@ ganryu                          // 0252 (c) 1999 Visco
 garou                           // 0253 (c) 1999 SNK
 garoubl                         // bootleg
 garouh                          // 0253 (c) 1999 SNK
+garouha                         // 0253 (c) 1999 SNK
 garoup                          // 0253 (c) 1999 SNK
 ghostlop                        // 0228 GhostLop (prototype) 1996? Data East
 goalx3                          // 0209 (c) 1995 Visco
@@ -29746,6 +29747,7 @@ pbobblen                        // 0083 (c) 1994 Taito
 pbobblenb                       // bootleg
 pgoal                           // 0219 (c) 1996 Saurus
 pnyaa                           // 0267 (c) 2003 Aiky / Taito
+pnyaaa                          // 0267 (c) 2003 Aiky / Taito
 popbounc                        // 0237 (c) 1997 Video System Co.
 preisle2                        // 0255 (c) 1999 Yumekobo
 pspikes2                        // 0068 (c) 1994 Video System Co.