diff --git a/.x-sc_bindtextdomain b/.x-sc_bindtextdomain
index 617565a2..a8d94e6f 100644
--- a/.x-sc_bindtextdomain
+++ b/.x-sc_bindtextdomain
@@ -1 +1 @@
-lib/regexprops\.c
\ No newline at end of file
+lib/regexprops\.c
diff --git a/.x-sc_prohibit_empty_lines_at_EOF b/.x-sc_prohibit_empty_lines_at_EOF
index 8c394a31..3231e1bd 100644
--- a/.x-sc_prohibit_empty_lines_at_EOF
+++ b/.x-sc_prohibit_empty_lines_at_EOF
@@ -4,3 +4,7 @@ locate/testsuite/locate\.gnu/.*\.xo
 find/testsuite/find\..*/.*\.xo
 COPYING
 doc/regexprops.texi
+m4/order-good\.bin
+m4/order-bad\.bin
+locate/testsuite/locate\.gnu/locateddb\.old\.x86\.xi
+locate/testsuite/locate\.gnu/locateddb\.old\.powerpc\.xi
diff --git a/ChangeLog b/ChangeLog
index 52508402..a398f3b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2011-06-05  James Youngman  <jay@gnu.org>
 
+	Fixes for empty-lines-at-EOF syntax check.
+	* .x-sc_bindtextdomain: Add newline at EOF.
+	* locate/Makefile.am: Remove empty trailing line at EOF.
+	* find/testsuite/sv-bug-32043.sh: Likewise.
+	* .x-sc_prohibit_empty_lines_at_EOF: Don't apply this check to
+	m4/order-good.bin m4/order-bad.bin
+	locate/testsuite/locate.gnu/locateddb.old.x86.xi
+	locate/testsuite/locate.gnu/locateddb.old.powerpc.xi.
+
 	Avoid some false positives for the sc_prohibit_doubled_word check.
 	* .x-sc_prohibit_doubled_word: don't perform this check on
 	xargs/testsuite/xargs.sysv/iquotes.xo or ChangeLog.
diff --git a/find/testsuite/sv-bug-32043.sh b/find/testsuite/sv-bug-32043.sh
index e81e1d18..ef8c0d4d 100755
--- a/find/testsuite/sv-bug-32043.sh
+++ b/find/testsuite/sv-bug-32043.sh
@@ -31,4 +31,3 @@ else
     echo "FAIL: could not create a test directory." >&2
     exit 1
 fi
-
diff --git a/locate/Makefile.am b/locate/Makefile.am
index 607f0559..53a8b53a 100644
--- a/locate/Makefile.am
+++ b/locate/Makefile.am
@@ -68,4 +68,3 @@ dist-hook: findutils-check-manpages
 
 findutils-check-manpages:
 	$(top_srcdir)/build-aux/man-lint.sh $(srcdir) $(man_MANS)
-