diff --git a/.travis.yml b/.travis.yml
index a198ce27..d397efb2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ go:
 - 1.8
 install:
 - go get github.com/tools/godep
+- go get github.com/client9/misspell
 script:
 - make test
 - if ([[ ${TRAVIS_BRANCH} == "master" ]] && [[ ${TRAVIS_EVENT_TYPE} == "push" ]]) || [[ -n ${TRAVIS_TAG} ]]; then
diff --git a/Makefile b/Makefile
index c02bc1ad..eb5f94e5 100644
--- a/Makefile
+++ b/Makefile
@@ -88,6 +88,7 @@ authors:
 deps:
 	@echo "--> Installing build dependencies"
 	@go get github.com/tools/godep
+	@go get github.com/client9/misspell
 
 vet:
 	@echo "--> Running go vet $(VETARGS) ."
@@ -116,6 +117,14 @@ format:
 	@echo "--> Running go fmt"
 	@gofmt -s -w *.go
 
+spelling:
+	@echo "--> Checking the spelling"
+	@misspell -error *.go
+
+linting:
+	@echo "--> Checking against linters"
+	@gometalinter --disable=errcheck --disable=gocyclo
+
 bench:
 	@echo "--> Running go bench"
 	@godep go test -v -bench=.
@@ -131,8 +140,10 @@ cover:
 
 test: deps
 	@echo "--> Running the tests"
+	@$(MAKE) golang
 	@godep go test -v
 	@$(MAKE) gofmt
+	@$(MAKE) spelling
 	@$(MAKE) vet
 	@$(MAKE) cover
 
diff --git a/rotation.go b/rotation.go
index 1c623f4a..b8d257d9 100644
--- a/rotation.go
+++ b/rotation.go
@@ -92,7 +92,7 @@ func (c *certificationRotation) watch() error {
 			case err := <-watcher.Errors:
 				log.WithFields(log.Fields{
 					"error": err.Error(),
-				}).Error("recieved an error from the file watcher")
+				}).Error("received an error from the file watcher")
 			}
 		}
 	}()