diff --git a/src/mame/drivers/jailbrek.c b/src/mame/drivers/jailbrek.c
index 64dda973b0c..c2c05f620f5 100644
--- a/src/mame/drivers/jailbrek.c
+++ b/src/mame/drivers/jailbrek.c
@@ -15,6 +15,11 @@ ernesto@imagina.com
 
 */
 
+
+#define MASTER_CLOCK		XTAL_18_432MHz
+#define VOICE_CLOCK			XTAL_3_579545MHz
+
+
 #include "driver.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/sn76496.h"
@@ -236,25 +241,23 @@ static MACHINE_START( jailbrek )
 static MACHINE_DRIVER_START( jailbrek )
 
 	/* basic machine hardware */
-	MDRV_CPU_ADD(M6809, 3000000)        /* 3 MHz ??? */
+	MDRV_CPU_ADD(M6809, MASTER_CLOCK/12)
 	MDRV_CPU_PROGRAM_MAP(jailbrek_map, 0)
 	MDRV_CPU_VBLANK_INT(jb_interrupt,1)
 	MDRV_CPU_PERIODIC_INT(jb_interrupt_nmi, 500) /* ? */
 
-	MDRV_SCREEN_REFRESH_RATE(60)
-	MDRV_SCREEN_VBLANK_TIME(DEFAULT_60HZ_VBLANK_DURATION)
-
 	MDRV_MACHINE_START(jailbrek)
 
 	/* video hardware */
 	MDRV_VIDEO_ATTRIBUTES(VIDEO_TYPE_RASTER)
-	MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
-	MDRV_SCREEN_SIZE(32*8, 32*8)
-	MDRV_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1)
 	MDRV_GFXDECODE(jailbrek)
 	MDRV_PALETTE_LENGTH(32)
 	MDRV_COLORTABLE_LENGTH(512)
 
+	MDRV_SCREEN_ADD("main", 0)
+	MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 396, 8, 248, 256, 16, 240)
+	MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+
 	MDRV_PALETTE_INIT(jailbrek)
 	MDRV_VIDEO_START(jailbrek)
 	MDRV_VIDEO_UPDATE(jailbrek)
@@ -262,10 +265,10 @@ static MACHINE_DRIVER_START( jailbrek )
 	/* sound hardware */
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
-	MDRV_SOUND_ADD(SN76496, 1500000)
+	MDRV_SOUND_ADD(SN76496, MASTER_CLOCK/12)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
-	MDRV_SOUND_ADD(VLM5030, 3580000)
+	MDRV_SOUND_ADD(VLM5030, VOICE_CLOCK)
 	MDRV_SOUND_CONFIG(vlm5030_interface)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
diff --git a/src/mame/video/jailbrek.c b/src/mame/video/jailbrek.c
index 12bc0b468a3..ee420994d94 100644
--- a/src/mame/video/jailbrek.c
+++ b/src/mame/video/jailbrek.c
@@ -72,6 +72,7 @@ VIDEO_START( jailbrek )
 {
 	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows,
 		TILEMAP_TYPE_PEN, 8, 8, 64, 32);
+	tilemap_set_scrolldx(bg_tilemap, 0, 396 - 256);
 }
 
 static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const rectangle *cliprect )