diff --git a/ChangeLog b/ChangeLog
index ad796b394..131084b59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
-2006-07-03  KHill  <fuzzballz@comcast.net>
+2006-07-30  AD7AI <fuzzballz@comcast.net>
 
-	* 
+	*  RIG_SETTING_MAX changed back to 32 and rigctl and rigmatrix corrected to reflect 32
+	    bit words per readme.developer.  Rigmatrix could use a little more testing, but seems to
+	    work ok.
 
 2006-07-03  KHill  <fuzzballz@comcast.net>
 
diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index 9dcef8278..384a8e923 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -2,7 +2,7 @@
  *  Hamlib Interface - API header
  *  Copyright (c) 2000-2005 by Stephane Fillod and Frank Singleton
  *
- *	$Id: rig.h,v 1.112 2006-07-18 22:51:42 n0nb Exp $
+ *	$Id: rig.h,v 1.113 2006-09-22 14:31:19 n0nb Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -627,7 +627,7 @@ enum rig_parm_e {
 #define RIG_PARM_IS_FLOAT(l) ((l)&RIG_PARM_FLOAT_LIST)
 #define RIG_PARM_SET(l) ((l)&~RIG_PARM_READONLY_LIST)
 
-#define RIG_SETTING_MAX 64
+#define RIG_SETTING_MAX 32
 /**
  * \brief Setting
  *
diff --git a/tests/rigctl.c b/tests/rigctl.c
index 8e31571b0..9457c2cac 100644
--- a/tests/rigctl.c
+++ b/tests/rigctl.c
@@ -5,7 +5,7 @@
  * It takes commands in interactive mode as well as 
  * from command line options.
  *
- * $Id: rigctl.c,v 1.59 2006-07-18 22:51:43 n0nb Exp $  
+ * $Id: rigctl.c,v 1.60 2006-09-22 14:31:19 n0nb Exp $  
  *
  *
  * This program is free software; you can redistribute it and/or
@@ -1695,7 +1695,7 @@ void dump_chan(RIG *rig, channel_t *chan)
 	printf("Functions: %s\n", prntbuf);
 	
 	printf("Levels:");
-	for (idx=0; idx<60; idx++) {
+	for (idx=0; idx<RIG_SETTING_MAX; idx++) {
 		setting_t level = rig_idx2setting(idx);
 		const char *level_s;
 
diff --git a/tests/rigmatrix.c b/tests/rigmatrix.c
index 86d70498d..849856fda 100644
--- a/tests/rigmatrix.c
+++ b/tests/rigmatrix.c
@@ -4,7 +4,7 @@
  * The code is rather ugly since this is only a try out.
  *
  *
- *    $Id: rigmatrix.c,v 1.20 2004-08-29 18:21:26 fineware Exp $  
+ *    $Id: rigmatrix.c,v 1.21 2006-09-22 14:31:19 n0nb Exp $  
  *
  *
  * This program is free software; you can redistribute it and/or
@@ -253,7 +253,7 @@ int print_caps_parm(const struct rig_caps *caps, void *data)
 	/*
 	 * bitmap_parm: only those who have a label
 	 */
-	for (i = 0; i < 60; i++) {
+	for (i = 0; i < RIG_SETTING_MAX; i++) {
 			if (rig_idx2setting(i) & bitmap_parm)
 					print_yn(parm & rig_idx2setting(i));
 	}
@@ -283,7 +283,7 @@ int print_caps_level(const struct rig_caps *caps, void *data)
 	/*
 	 * bitmap_level: only those who have a label
 	 */
-	for (i = 0; i < 60; i++) {
+	for (i = 0; i < 32; i++) {
 			if (rig_idx2setting(i) & bitmap_level)
 					print_yn(level & rig_idx2setting(i));
 	}
@@ -313,7 +313,7 @@ int print_caps_func(const struct rig_caps *caps, void *data)
 	/*
 	 * bitmap_func: only those who have a label
 	 */
-	for (i = 0; i < 60; i++) {
+	for (i = 0; i < RIG_SETTING_MAX; i++) {
 			if (rig_idx2setting(i) & bitmap_func)
 					print_yn(func & rig_idx2setting(i));
 	}
@@ -554,7 +554,7 @@ int main (int argc, char *argv[])
 	bitmap_func = 0;
 	prntbuf[0] = '\0';
 	pbuf = prntbuf;
-	for (i = 0; i < 60; i++) {
+	for (i = 0; i < RIG_SETTING_MAX; i++) {
 			setting_t func = rig_idx2setting(i);
 			const char *s = rig_strfunc(func);
 			if (!s)
@@ -584,7 +584,7 @@ int main (int argc, char *argv[])
 	bitmap_level = 0;
 	prntbuf[0] = '\0';
 	pbuf = prntbuf;
-	for (i = 0; i < 60; i++) {
+	for (i = 0; i < RIG_SETTING_MAX; i++) {
 			setting_t level = rig_idx2setting(i);
 			const char *s = rig_strlevel(level);
 			if (!s)
@@ -614,7 +614,7 @@ int main (int argc, char *argv[])
 	bitmap_parm = 0;
 	prntbuf[0] = '\0';
 	pbuf = prntbuf;
-	for (i = 0; i < 60; i++) {
+	for (i = 0; i < RIG_SETTING_MAX; i++) {
 			setting_t parm = rig_idx2setting(i);
 			const char *s = rig_strparm(parm);
 			if (!s)