diff --git a/sys/arch/atari/dev/grfabs.c b/sys/arch/atari/dev/grfabs.c
index 951fb1a64218..7c3bcbc3f580 100644
--- a/sys/arch/atari/dev/grfabs.c
+++ b/sys/arch/atari/dev/grfabs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: grfabs.c,v 1.5 1995/08/20 18:17:31 leo Exp $	*/
+/*	$NetBSD: grfabs.c,v 1.6 1995/09/04 19:41:39 leo Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman.
@@ -74,14 +74,14 @@ long		gra_con_colors[MAX_CENTRIES];
 u_long gra_def_color16[16] = {
 	0x00000000,	/* black		*/
 	0x00ffffff,	/* white		*/
-	0x00c0c0c0,	/* light gray		*/
-	0x00808080,	/* gray			*/
-	0x000000c0,	/* blue			*/
-	0x0000c000,	/* green		*/
-	0x0000c0c0,	/* cyan			*/
+	0x000c0c0c,	/* light gray		*/
+	0x00808008,	/* gray			*/
+	0x0000000c,	/* blue			*/
+	0x00000c00,	/* green		*/
+	0x00000c0c,	/* cyan			*/
 	0x00c00000,	/* red			*/
-	0x00c000c0,	/* magenta		*/
-	0x00c0c000,	/* brown		*/
+	0x00c0000c,	/* magenta		*/
+	0x00c00c00,	/* brown		*/
 	0x000000ff,	/* light blue		*/
 	0x0000ff00,	/* light green		*/
 	0x0000ffff,	/* light cyan		*/
diff --git a/sys/arch/atari/dev/grfabs_reg.h b/sys/arch/atari/dev/grfabs_reg.h
index 7ae764debf81..1377d2aee844 100644
--- a/sys/arch/atari/dev/grfabs_reg.h
+++ b/sys/arch/atari/dev/grfabs_reg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: grfabs_reg.h,v 1.4 1995/08/20 18:17:33 leo Exp $	*/
+/*	$NetBSD: grfabs_reg.h,v 1.5 1995/09/04 19:41:41 leo Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman
@@ -133,22 +133,22 @@ enum colormap_type {
 #define MAKE_GREY_ENTRY(l)	(l & 0xff)
 
 #define CM_L2TT(v) \
-    (((0x00f00000 & (v)) >> 12) | ((0x0000f000 & (v)) >> 8) |\
-      (0x000000f0 & (v)) >> 4)
+    (((0x000f0000 & (v)) >> 8) | ((0x00000f00 & (v)) >> 4) |\
+      (0x0000000f & (v)))
 #define CM_TT2L(v) \
     ((((0x00000f00 & (v)) * 0xff / 0xf) << 8) |\
      (((0x000000f0 & (v)) * 0xff / 0xf) << 4) |\
        (0x0000000f & (v)) * 0xff / 0xf)
 #define CM_L2FAL(v) \
-    (((0x00fc0000 & (v)) << 8) | ((0x0000fc00 & (v)) << 8) |\
-      (0x000000fc & (v)))
+    (((0x003f0000 & (v)) << 10) | ((0x00003f00 & (v)) << 10) |\
+      (0x0000003f & (v)) << 2)
 #define CM_FAL2L(v) \
     (((((0xfc000000 & (v)) >> 10) * 0xff / 0x3f) & 0x00ff0000) |\
      ((((0x00fc0000 & (v)) >> 10) * 0xff / 0x3f) & 0x0000ff00) |\
        ((0x000000fc & (v)) >>  2) * 0xff / 0x3f)
 #define CM_L2ST(v) \
-    (((0x00e00000 & (v)) >> 13) | ((0x0000e000 & (v)) >> 9) |\
-      (0x000000e0 & (v)) >> 5)
+    (((0x000e0000 & (v)) >> 9) | ((0x00000e00 & (v)) >> 5) |\
+      (0x0000000e & (v)) >> 1)
 #define CM_ST2L(v) \
     (((((0x00000700 & (v)) * 0xff / 0x7) << 8) & 0x00ff0000) |\
      ((((0x00000070 & (v)) * 0xff / 0x7) << 4) & 0x0000ff00) |\