diff --git a/src/video/vid_ati_mach64.c b/src/video/vid_ati_mach64.c
index d9c290897..6b2575deb 100644
--- a/src/video/vid_ati_mach64.c
+++ b/src/video/vid_ati_mach64.c
@@ -543,6 +543,7 @@ mach64_recalctimings(svga_t *svga)
         svga->split                    = 0xffffff;
         svga->vblankstart              = svga->dispend;
         svga->rowcount                 = mach64->crtc_gen_cntl & 1;
+        svga->lut_map                  = (mach64->type >= MACH64_VT2);
         svga->rowoffset <<= 1;
 
         if (mach64->type == MACH64_GX)
@@ -592,6 +593,7 @@ mach64_recalctimings(svga_t *svga)
         svga->vram_display_mask = mach64->vram_mask;
     } else {
         svga->vram_display_mask = (mach64->regs[0x36] & 0x01) ? mach64->vram_mask : 0x3ffff;
+        svga->lut_map           = 0;
     }
 }
 
@@ -4028,6 +4030,29 @@ mach64_readl(uint32_t addr, void *priv)
     return ret;
 }
 
+uint32_t
+mach64_conv_16to32(svga_t* svga, uint16_t color, uint8_t bpp)
+{
+    uint32_t ret = 0x00000000;
+
+    if (svga->lut_map) {
+        if (bpp == 15) {
+            uint8_t b = getcolr(svga->pallook[(color & 0x1f) << 3]);
+            uint8_t g = getcolg(svga->pallook[(color & 0x3e0) >> 2]);
+            uint8_t r = getcolb(svga->pallook[(color & 0x7c00) >> 7]);
+            ret = (video_15to32[color] & 0xFF000000) | makecol(r, g, b);
+        } else {
+            uint8_t b = getcolr(svga->pallook[(color & 0x1f) << 3]);
+            uint8_t g = getcolg(svga->pallook[(color & 0x7e0) >> 3]);
+            uint8_t r = getcolb(svga->pallook[(color & 0xf800) >> 8]);
+            ret = (video_16to32[color] & 0xFF000000) | makecol(r, g, b);
+        }
+    } else
+        ret = (bpp == 15) ? video_15to32[color] : video_16to32[color];
+
+    return ret;
+}
+
 void
 mach64_int_hwcursor_draw(svga_t *svga, int displine)
 {
@@ -4879,6 +4904,10 @@ mach64_common_init(const device_t *info)
 
     svga->clock_gen = device_add(&ics2595_device);
 
+    if (mach64->type >= MACH64_VT2) {
+        svga->conv_16to32 = mach64_conv_16to32;
+    }
+
     mach64->dst_cntl = 3;
 
     mach64->thread_run = 1;