diff --git a/.presubmit/context b/.presubmit/context
new file mode 100755
index 000000000..b7d6ef971
--- /dev/null
+++ b/.presubmit/context
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+echo "** presubmit/$(basename $0)"
+
+if grep -lr "golang.org/x/net/context" "$@"; then
+    echo "** presubmit/$(basename $0): please use std lib's 'context' instead"
+    exit 1
+fi
diff --git a/Makefile b/Makefile
index 6b06cd8f2..4c52b7717 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ SYSTEM:=
 CHECKS:=check godeps
 VERBOSE:=-v
 GOPATH?=$(HOME)/go
+PRESUBMIT:=core coremain plugin
 
 all: coredns
 
@@ -13,7 +14,7 @@ coredns: $(CHECKS)
 	CGO_ENABLED=0 $(SYSTEM) go build $(VERBOSE) -ldflags="-s -w -X github.com/coredns/coredns/coremain.GitCommit=$(GITCOMMIT)" -o $(BINARY)
 
 .PHONY: check
-check: linter goimports core/zplugin.go core/dnsserver/zdirectives.go godeps
+check: presubmit linter goimports core/zplugin.go core/dnsserver/zdirectives.go godeps
 
 .PHONY: test
 test: check
@@ -87,6 +88,11 @@ linter:
 goimports:
 	( gometalinter --deadline=2m --disable-all --enable=goimports --vendor --exclude=^pb/ ./... || true )
 
+# Presubmit runs all scripts in .presubmit; any non 0 exit code will fail the build.
+.PHONY: presubmit
+presubmit:
+	@for pre in $(PWD)/.presubmit/* ; do "$$pre" $(PRESUBMIT); done
+
 .PHONY: clean
 clean:
 	go clean