diff --git a/src/blt.c b/src/blt.c
index 0f8d78e..0c212aa 100644
--- a/src/blt.c
+++ b/src/blt.c
@@ -604,6 +604,42 @@ void blt_rgb565_to_rgba8888(
     }
 }
 
+void blt_rgb555_to_rgba8888(
+    unsigned int* dst,
+    int dst_x,
+    int dst_y,
+    int dst_w,
+    int dst_h,
+    int dst_p,
+    unsigned short* src,
+    int src_x,
+    int src_y,
+    int src_p)
+{
+    size_t s_a = (src_p / sizeof(src[0])) - dst_w;
+    size_t d_a = (dst_p / sizeof(dst[0])) - dst_w;
+
+    src += src_x + ((src_p / sizeof(src[0])) * src_y);
+    dst += dst_x + ((dst_p / sizeof(dst[0])) * dst_y);
+
+    for (unsigned int* h_end = dst + dst_h * (dst_w + d_a); dst < h_end;)
+    {
+        for (unsigned int* w_end = dst + dst_w; dst < w_end;)
+        {
+            unsigned short pixel = *src++;
+
+            BYTE r = ((pixel & 0x7C00) >> 10) << 3;
+            BYTE g = ((pixel & 0x03E0) >> 5) << 3;
+            BYTE b = ((pixel & 0x001F)) << 3;
+
+            *dst++ = (0xFF << 24) | (b << 16) | (g << 8) | r;
+        }
+
+        src += s_a;
+        dst += d_a;
+    }
+}
+
 void blt_bgra8888_to_rgba8888(
     unsigned int* dst,
     int dst_x,
diff --git a/src/screenshot.c b/src/screenshot.c
index d6a3578..d9623c6 100644
--- a/src/screenshot.c
+++ b/src/screenshot.c
@@ -58,17 +58,34 @@ static BOOL ss_screenshot_16bit(char* filename, IDirectDrawSurfaceImpl* src)
 
     if (buf)
     {
-        blt_rgb565_to_rgba8888(
-            buf,
-            0,
-            0,
-            src->width,
-            src->height,
-            src->width * 4,
-            dds_GetBuffer(src),
-            0,
-            0,
-            src->pitch);
+        if (g_ddraw->rgb555)
+        {
+            blt_rgb555_to_rgba8888(
+                buf,
+                0,
+                0,
+                src->width,
+                src->height,
+                src->width * 4,
+                dds_GetBuffer(src),
+                0,
+                0,
+                src->pitch);
+        }
+        else
+        {
+            blt_rgb565_to_rgba8888(
+                buf,
+                0,
+                0,
+                src->width,
+                src->height,
+                src->width * 4,
+                dds_GetBuffer(src),
+                0,
+                0,
+                src->pitch);
+        }
 
         error = lodepng_encode32_file(filename, (unsigned char*)buf, src->width, src->height);