diff --git a/lib/bdev/virtio/README.md b/lib/bdev/virtio/README.md
index 8d5df64f1e..7ca372e6dd 100644
--- a/lib/bdev/virtio/README.md
+++ b/lib/bdev/virtio/README.md
@@ -39,7 +39,7 @@ the /tmp/vhost.0 domain socket.
 
 ## Todo:
 * Add I/O channel support.  Includes requesting correct number of queues
-  (based on core count).  Fail device initialization if not enough queues 
+  (based on core count).  Fail device initialization if not enough queues
   can be allocated.
 * Add RPCs.
 * Break out the "rte_virtio" code into a separate library that is not
diff --git a/scripts/eofnl b/scripts/eofnl
index bf87eebd25..59544561df 100755
--- a/scripts/eofnl
+++ b/scripts/eofnl
@@ -29,4 +29,10 @@ if grep -q $'\r' "$f"; then
 	exit 1
 fi
 
+if grep -q $'[\t ]$' "$f"; then
+	echo "$f: Trailing whitespace"
+	sed -i $'s/[ \t]*$//' "$f"
+	exit 1
+fi
+
 exit 0
diff --git a/scripts/perf/nvme/README b/scripts/perf/nvme/README
index c7b6ad3544..6468399a7c 100644
--- a/scripts/perf/nvme/README
+++ b/scripts/perf/nvme/README
@@ -1,6 +1,6 @@
 These scripts are used to perform benchmark testing with fio.
 The run_fio_test.py is the main script that runs the performance test and parses the test results.
-Users can populate test parameters for different fio workloads in the lists (q_depth, io_size, workload_type, mix, core_mask and run_time) at the top of the run_fio_test.py script. 
+Users can populate test parameters for different fio workloads in the lists (q_depth, io_size, workload_type, mix, core_mask and run_time) at the top of the run_fio_test.py script.
 The run_fio_test.py puts the test results in a csv file named <hostname>_<num ssds>_perf_output.csv.
 The run_fio_test.sh script demonstrates how to invoke the run_fio_test.py script with the
 input parameters: path_to_fio_conf, path_to_ioengine and num_ssds. The run_fio_test.sh script will