diff --git a/.travis.yml b/.travis.yml
index bf8de0c..303291c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,6 @@ before_script:
 script:
   - ./scripts/licensecheck.sh
   - go build ./...
-  - ./scripts/golint.sh
+  - golint -set_exit_status ./...
   - go vet ./...
   - go test -v ./...
diff --git a/AUTHORS b/AUTHORS
index dd3b999..1f0d4f6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,3 +12,4 @@ Contributors
 Justin Kim	<justin@digitalocean.com>
 Ricky Medina	<rm@do.co>
 Charlie Drage <charlie@charliedrage.com>
+Michael Koppmann <me@mkoppmann.at>
diff --git a/scripts/golint.sh b/scripts/golint.sh
deleted file mode 100755
index 54696d7..0000000
--- a/scripts/golint.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# Verify that all files are correctly golint'd.
-EXIT=0
-GOLINT=$(golint ./...)
-
-if [[ ! -z $GOLINT ]]; then
-	echo $GOLINT
-	EXIT=1
-fi
-
-exit $EXIT