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/CONTRIBUTING.md b/CONTRIBUTING.md
index ada1e95..1b5b741 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -25,3 +25,6 @@ under the "Contributors" section using the format:
 `First Last <email@example.com>`.
 
 Finally, submit a pull request for review!
+
+Questions?  Feel free to join us in [`#go-qemu` on freenode](https://webchat.freenode.net/)
+if you'd like to discuss the project.
diff --git a/README.md b/README.md
index 0810f27..3c1143c 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,9 @@ This should be considered a work in progress. Most functionaly provided by the C
 bindings have not yet made their way into this library. [Pull requests are welcome](https://github.com/digitalocean/go-libvirt/blob/master/CONTRIBUTING.md)!
 The definition of the RPC protocol is in the libvirt source tree under [src/rpc/virnetprotocol.x](https://github.com/libvirt/libvirt/blob/master/src/rpc/virnetprotocol.x).
 
+Feel free to join us in [`#go-qemu` on freenode](https://webchat.freenode.net/)
+if you'd like to discuss the project.
+
 Warning
 -------
 
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