diff --git a/CHANGES b/CHANGES
index 1cebc265..dfff4de6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,7 @@ SVN-HEAD
                           Print the asset tag
                           Fix the timestamp decoding
   Program i2cdump: Fix I2C block mode error code
+  Program fancontrol: Detect improperly formatted FCTEMPS value (#2293)
   Program pwmconfig: Better diagnostics in pwmdisable
                      Give the fans some time to spin up
                      Really hide errors on sysfs writes
diff --git a/prog/pwm/fancontrol b/prog/pwm/fancontrol
index b6391f40..b479b5a1 100755
--- a/prog/pwm/fancontrol
+++ b/prog/pwm/fancontrol
@@ -82,6 +82,13 @@ function LoadConfig {
 	let fcvcount=0
 	for fcv in $FCTEMPS
 	do
+		if ! echo $fcv | egrep -q '='
+		then
+			echo "Error in configuration file:"
+			echo "FCTEMPS value is improperly formatted"
+			exit 1
+		fi
+
 		AFCPWM[$fcvcount]=`echo $fcv |cut -d'=' -f1`
 		AFCTEMP[$fcvcount]=`echo $fcv |cut -d'=' -f2`
 		AFCFAN[$fcvcount]=`echo $FCFANS |sed -e 's/ /\n/g' |egrep "${AFCPWM[$fcvcount]}" |cut -d'=' -f2`