diff --git a/avivotool.c b/avivotool.c
index c08c388..fa09d8f 100644
--- a/avivotool.c
+++ b/avivotool.c
@@ -1042,15 +1042,15 @@ void radeon_cmd_regs(const char *type)
 
     /* Dump all registers that we can read. */
     if (strcmp(type, "all") == 0) {
-        /* Attempting to read 40c8 will bring your machine down hard. */
-        for (i = 0x0000; i < 0x40c8; i += 4)
+        for (i = 0x0000; i < 0x5bc; i += 4)
             SHOW_UNKNOWN_REG(i);
-        /* Ditto 4ff8 and 4ffc.  They may be indexing registers, or they
-         * may just kill your system. */
-        for (i = 0x40cc; i < 0x4ff8; i += 4)
+        for (i = 0x5dfc; i < 0x7170; i += 4)
             SHOW_UNKNOWN_REG(i);
-        /* Reading to the end of the range is also harmful. */
-        for (i = 0x5000; i < 0x7ff8; i += 4)
+        for (i = 0x75a0; i < 0x7764; i += 4)
+            SHOW_UNKNOWN_REG(i);
+        for (i = 0x79a0; i < 0x7b64; i += 4)
+            SHOW_UNKNOWN_REG(i);
+        for (i = 0x7ec0; i < 0x8000; i += 4)
             SHOW_UNKNOWN_REG(i);
 
         return;