diff --git a/build/Makefile.lint b/build/Makefile.lint
index 46f570c46..abe79b801 100644
--- a/build/Makefile.lint
+++ b/build/Makefile.lint
@@ -4,8 +4,9 @@ lint: golint golangci-lint check-license tfproviderlint tfproviderdocs terrafmt
 
 .PHONY: tfproviderlint
 tfproviderlint: tools
-	@ echo "-> Checking source code against terraform provider linters..."
-	@ $(GOBIN)/tfproviderlint ./...
+	@ echo '-> Ignoring tfproviderlint until https://github.com/bflad/tfproviderlint/issues/255 is fixed...'
+	#@ echo "-> Checking source code against terraform provider linters..."
+	#@ $(GOBIN)/tfproviderlint ./...
 
 .PHONY: tfproviderdocs
 tfproviderdocs: tools
@@ -39,4 +40,4 @@ validate-examples:
 ## Formats all the terraform ".tf" files in the repository
 fmt:
 	@ echo "-> Checking that the terraform .tf files are formatted..."
-	@ terraform fmt -write=false -recursive -check
\ No newline at end of file
+	@ terraform fmt -write=false -recursive -check
diff --git a/build/Makefile.tools b/build/Makefile.tools
index d36d485b1..ceeeabf1e 100644
--- a/build/Makefile.tools
+++ b/build/Makefile.tools
@@ -1,7 +1,7 @@
 
 VERSION_TFPROVIDERDOCS:=v0.6.0
 VERSION_TERRAFMT:=12db38d
-VERSION_TFPROVIDERLINT:=v0.14.0
+VERSION_TFPROVIDERLINT:=v0.28.1
 
 ## Installs the required static checks for terraform.
 tools: $(GOBIN)/tfproviderdocs $(GOBIN)/terrafmt $(GOBIN)/tfproviderlint