diff --git a/CHANGES b/CHANGES
index 85589153..d1846c83 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,6 +15,7 @@ SVN-HEAD
            Don't bail out on transient errors (#2330)
   sensors: Add support for instantaneous power sensors
            Add support for current sensors
+           Fix exit code in error case
   sensors.conf.8: Lots of additions and reworks
   sensors.conf.default: New, minimum version of sensors.conf.eg (#2333)
                         Add sections for the SMSC SCH311x and SCH5027
diff --git a/prog/sensors/main.c b/prog/sensors/main.c
index e3ebd457..02115017 100644
--- a/prog/sensors/main.c
+++ b/prog/sensors/main.c
@@ -243,7 +243,7 @@ static void print_bus_list(void)
 
 int main(int argc, char *argv[])
 {
-	int c, res, i, error, do_bus_list;
+	int c, res, i, error = 0, do_bus_list;
 	const char *config_file_name = NULL;
 
 	struct option long_opts[] =  {
@@ -344,5 +344,5 @@ int main(int argc, char *argv[])
 
 exit:
 	sensors_cleanup();
-	exit(res);
+	exit(error);
 }