diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c
index 195f129922a..3d969d47038 100644
--- a/src/mame/drivers/opwolf.c
+++ b/src/mame/drivers/opwolf.c
@@ -555,12 +555,15 @@ static INPUT_PORTS_START( opwolf )
 	PORT_DIPNAME( 0x02, 0x02, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW1:2")
 	PORT_DIPSETTING(    0x02, DEF_STR( No ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
-	TAITO_DSWA_BITS_2_TO_3
-	TAITO_COINAGE_WORLD
+	PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) PORT_DIPLOCATION("SW1:3")
+	PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:4")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) ) \
+	PORT_DIPSETTING(    0x08, DEF_STR( On ) )
+	TAITO_COINAGE_WORLD_LOC(SW1)
 
 	/* 0x380002 -> 0x0ff02a (-$fd6,A5) (C-chip) */
 	PORT_START("DSWB")
-	TAITO_DIFFICULTY
+	TAITO_DIFFICULTY_LOC(SW2)
 	PORT_DIPNAME( 0x0c, 0x0c, "Ammo Magazines at Start" ) PORT_DIPLOCATION("SW2:3,4")
 	PORT_DIPSETTING(    0x00, "4" )
 	PORT_DIPSETTING(    0x04, "5" )