diff --git a/[refs] b/[refs]
index ab85b832f246..f2ae8f4d7194 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43f901fbc8ba94bfa8d58155ba9378d7a13af636
+refs/heads/master: 2979076fbf17a0947d6eba367b0cac19c907c160
diff --git a/trunk/scripts/headers_install.pl b/trunk/scripts/headers_install.pl
index 4ca3be3b2e50..efb3be10d428 100644
--- a/trunk/scripts/headers_install.pl
+++ b/trunk/scripts/headers_install.pl
@@ -45,6 +45,13 @@
 	close $in;
 
 	system $unifdef . " $tmpfile > $installdir/$file";
+	# unifdef will exit 0 on success, and will exit 1 when the
+	# file was processed successfully but no changes were made,
+	# so abort only when it's higher than that.
+	my $e = $? >> 8;
+	if ($e > 1) {
+		die "$tmpfile: $!\n";
+	}
 	unlink $tmpfile;
 }
 exit 0;