diff --git a/.travis.yml b/.travis.yml
index 28642157c..f4c54863f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,8 @@
+sudo: false
 language: python
 python: "2.7"
 install:
- - cd ..
- - git clone https://github.com/haikuports/haikuporter.git --depth=1
- - cd haikuports
+ - cd .. && git clone https://github.com/haikuports/haikuporter.git --depth=1 && cd haikuports
  - PATH=$PATH:../haikuporter && export PATH
  - printf 'TREE_PATH="'`pwd`'"\nPACKAGER="Nobody <server@fake>"\nTARGET_ARCHITECTURE="x86"\n' >haikuports.conf
  - wget https://github.com/waddlesplash/haiku-licenses/archive/master.zip && unzip master.zip
diff --git a/lint-new-recipes.sh b/lint-new-recipes.sh
index 50d1e62aa..214c0dfcd 100755
--- a/lint-new-recipes.sh
+++ b/lint-new-recipes.sh
@@ -6,6 +6,11 @@ git fetch real_origin
 files=$(git diff $(git rev-parse --abbrev-ref HEAD) real_origin/master --numstat | awk '{print $3}')
 for file in $files; do
 	if [ -e "$file" ] && [[ "$file" == *recipe ]]; then
+		LINES=$(grep -l '[[:blank:]]$' $file)
+		if [ ! -z "$LINES" ]; then
+			echo "Trailing whitespace in '$file'."; exit 1
+		fi
+
 		baseName=$(basename $file)
 		portName=${baseName::-7}
 		haikuporter $@ --lint $portName