diff --git a/CHANGES b/CHANGES
index 7035f8ed..254cdf80 100644
--- a/CHANGES
+++ b/CHANGES
@@ -29,6 +29,7 @@ ask CVS about it:
   Module i2c-sis630: Sync with 2.6.0-X driver version
   Module it87: Add pwm and "smart guardian" support
   Module lm90: Add ADM1032 support
+  Program pwmconfig: Handle multiple fans controlled by a single pwm
   Program sensors: Add ADM1032 support
   Program sensors-detect: Prefer Super I/O drivers;
                           Fix W83627HF and W83791D detection; detect CSB6;
diff --git a/prog/pwm/pwmconfig b/prog/pwm/pwmconfig
index 9b4b24b3..3b53fa86 100755
--- a/prog/pwm/pwmconfig
+++ b/prog/pwm/pwmconfig
@@ -228,8 +228,14 @@ do
 		then
 			echo "    It appears that fan $j"
 			echo "    is controlled by pwm $i"
-			let pwmactivecount=1
-			pwmactive="$i ${pwmactive}"
+#
+# a PWM can control more than one fan....
+#
+			if [ $pwmactivecount -eq 0 ]
+			then
+				let pwmactivecount=1
+				pwmactive="$i ${pwmactive}"
+			fi
 			sleep $DELAY
 			if [ $? -ne 0 ]
 			then