diff --git a/Makefile b/Makefile
index 572cd2647..f16faaaac 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ GO_LICENSER_EXCLUDE=stacktrace/testdata
 check: precheck check-modules test
 
 .PHONY: precheck
-precheck: check-goimports check-lint check-vet check-dockerfile-testing check-licenses
+precheck: check-goimports check-lint check-vanity-import check-vet check-dockerfile-testing check-licenses
 
 .PHONY: check-goimports
 .PHONY: check-dockerfile-testing
@@ -79,3 +79,7 @@ endif
 .PHONY: update-licenses
 update-licenses:
 	go-licenser $(patsubst %, -exclude %, $(GO_LICENSER_EXCLUDE)) .
+
+.PHONY: check-vanity-import
+check-vanity-import:
+	@if [[ $(porto -l . | wc -c) -ne 0 ]]; then echo "Vanity imports are not up to date" ; exit 1 ; fi
diff --git a/apmconfig/doc.go b/apmconfig/doc.go
index dd29e1525..32eb9d279 100644
--- a/apmconfig/doc.go
+++ b/apmconfig/doc.go
@@ -17,4 +17,4 @@
 
 // Package apmconfig provides an API for watching agent config
 // changes.
-package apmconfig
+package apmconfig // import "go.elastic.co/apm/apmconfig"
diff --git a/apmconfig/watcher.go b/apmconfig/watcher.go
index 57ea3c412..7042080a0 100644
--- a/apmconfig/watcher.go
+++ b/apmconfig/watcher.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmconfig
+package apmconfig // import "go.elastic.co/apm/apmconfig"
 
 import (
 	"context"
diff --git a/apmtest/configwatcher.go b/apmtest/configwatcher.go
index 723466a79..7e60f4c38 100644
--- a/apmtest/configwatcher.go
+++ b/apmtest/configwatcher.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmtest
+package apmtest // import "go.elastic.co/apm/apmtest"
 
 import (
 	"context"
diff --git a/apmtest/discard.go b/apmtest/discard.go
index 186b21af8..565f66d5c 100644
--- a/apmtest/discard.go
+++ b/apmtest/discard.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmtest
+package apmtest // import "go.elastic.co/apm/apmtest"
 
 import (
 	"log"
diff --git a/apmtest/env.go b/apmtest/env.go
index 20d069f2b..e798ae9f0 100644
--- a/apmtest/env.go
+++ b/apmtest/env.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmtest
+package apmtest // import "go.elastic.co/apm/apmtest"
 
 import "os"
 
diff --git a/apmtest/httpsuite.go b/apmtest/httpsuite.go
index cf075b24a..5e3503a74 100644
--- a/apmtest/httpsuite.go
+++ b/apmtest/httpsuite.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmtest
+package apmtest // import "go.elastic.co/apm/apmtest"
 
 import (
 	"net/http"
diff --git a/apmtest/recorder.go b/apmtest/recorder.go
index 8f2e65519..6a1f7a996 100644
--- a/apmtest/recorder.go
+++ b/apmtest/recorder.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmtest
+package apmtest // import "go.elastic.co/apm/apmtest"
 
 import (
 	"context"
diff --git a/apmtest/recordlogger.go b/apmtest/recordlogger.go
index 9196c3685..d8760ab6b 100644
--- a/apmtest/recordlogger.go
+++ b/apmtest/recordlogger.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmtest
+package apmtest // import "go.elastic.co/apm/apmtest"
 
 import "fmt"
 
diff --git a/apmtest/testlogger.go b/apmtest/testlogger.go
index 1bbbdf92a..29665b807 100644
--- a/apmtest/testlogger.go
+++ b/apmtest/testlogger.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmtest
+package apmtest // import "go.elastic.co/apm/apmtest"
 
 // TestLogger is an implementation of apm.Logger,
 // logging to a testing.T.
diff --git a/apmtest/withtransaction.go b/apmtest/withtransaction.go
index 3c19998a4..fcba6df5e 100644
--- a/apmtest/withtransaction.go
+++ b/apmtest/withtransaction.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmtest
+package apmtest // import "go.elastic.co/apm/apmtest"
 
 import (
 	"context"
diff --git a/breakdown.go b/breakdown.go
index df6cf5190..4c1932536 100644
--- a/breakdown.go
+++ b/breakdown.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"fmt"
diff --git a/builtin_metrics.go b/builtin_metrics.go
index 546384efc..81786b51e 100644
--- a/builtin_metrics.go
+++ b/builtin_metrics.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"context"
diff --git a/capturebody.go b/capturebody.go
index 5e3f402b0..1771dcf0f 100644
--- a/capturebody.go
+++ b/capturebody.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"bytes"
diff --git a/config.go b/config.go
index 10d48130b..7cd0f9c41 100644
--- a/config.go
+++ b/config.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"os"
diff --git a/context.go b/context.go
index 421af0af0..53f010f80 100644
--- a/context.go
+++ b/context.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"fmt"
diff --git a/error.go b/error.go
index 97ffc5b29..14023f4be 100644
--- a/error.go
+++ b/error.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"crypto/rand"
diff --git a/error_unix.go b/error_unix.go
index e54f30161..9772c4922 100644
--- a/error_unix.go
+++ b/error_unix.go
@@ -17,7 +17,7 @@
 
 // +build !windows
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"syscall"
diff --git a/error_windows.go b/error_windows.go
index e95ac0f24..984c9b66d 100644
--- a/error_windows.go
+++ b/error_windows.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"syscall"
diff --git a/fmt.go b/fmt.go
index 4d1ce0357..ebf0dcb32 100644
--- a/fmt.go
+++ b/fmt.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"context"
diff --git a/fnv.go b/fnv.go
index 0741e224f..c7d73db79 100644
--- a/fnv.go
+++ b/fnv.go
@@ -21,7 +21,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 const (
 	offset64 = 14695981039346656037
diff --git a/gocontext.go b/gocontext.go
index d238c0656..a5b3bd8ff 100644
--- a/gocontext.go
+++ b/gocontext.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"context"
diff --git a/gofuzz.go b/gofuzz.go
index 1fbbcaf33..92c7377c3 100644
--- a/gofuzz.go
+++ b/gofuzz.go
@@ -17,7 +17,7 @@
 
 // +build gofuzz
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"bytes"
diff --git a/logger.go b/logger.go
index 8e30e5918..e00fdeb67 100644
--- a/logger.go
+++ b/logger.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 // Logger is an interface for logging, used by the tracer
 // to log tracer errors and other interesting events.
diff --git a/metrics.go b/metrics.go
index 6f5ecb7e2..3f7aac6a7 100644
--- a/metrics.go
+++ b/metrics.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"context"
diff --git a/model/doc.go b/model/doc.go
index 3fe20d31a..b05724e56 100644
--- a/model/doc.go
+++ b/model/doc.go
@@ -18,4 +18,4 @@
 // Package model provides the Elastic APM model types.
 //
 // https://www.elastic.co/guide/en/apm/server/current/intake-api.html
-package model
+package model // import "go.elastic.co/apm/model"
diff --git a/model/gofuzz.go b/model/gofuzz.go
index 04fb279e2..7832d2ba4 100644
--- a/model/gofuzz.go
+++ b/model/gofuzz.go
@@ -17,7 +17,7 @@
 
 // +build gofuzz
 
-package model
+package model // import "go.elastic.co/apm/model"
 
 import (
 	"bytes"
diff --git a/model/maps.go b/model/maps.go
index 7313d9cf7..570c8a9a1 100644
--- a/model/maps.go
+++ b/model/maps.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package model
+package model // import "go.elastic.co/apm/model"
 
 // StringMap is a slice-representation of map[string]string,
 // optimized for fast JSON encoding.
diff --git a/model/marshal.go b/model/marshal.go
index 8e8445473..a1aa130ce 100644
--- a/model/marshal.go
+++ b/model/marshal.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package model
+package model // import "go.elastic.co/apm/model"
 
 import (
 	"encoding/hex"
diff --git a/model/model.go b/model/model.go
index a9d1224d9..2a041bd57 100644
--- a/model/model.go
+++ b/model/model.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package model
+package model // import "go.elastic.co/apm/model"
 
 import (
 	"net/http"
diff --git a/modelwriter.go b/modelwriter.go
index c6677ba2c..d21c8d258 100644
--- a/modelwriter.go
+++ b/modelwriter.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"go.elastic.co/apm/internal/ringbuffer"
diff --git a/module/apmbeego/doc.go b/module/apmbeego/doc.go
index 4cabea5e2..495f4fde7 100644
--- a/module/apmbeego/doc.go
+++ b/module/apmbeego/doc.go
@@ -16,4 +16,4 @@
 // under the License.
 
 // Package apmbeego provides tracing and error-reporting middleware for Beego applications.
-package apmbeego
+package apmbeego // import "go.elastic.co/apm/module/apmbeego"
diff --git a/module/apmbeego/filter.go b/module/apmbeego/filter.go
index a6f04dadf..f72623ef0 100644
--- a/module/apmbeego/filter.go
+++ b/module/apmbeego/filter.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmbeego
+package apmbeego // import "go.elastic.co/apm/module/apmbeego"
 
 import (
 	"context"
diff --git a/module/apmchi/doc.go b/module/apmchi/doc.go
index bdaff6360..8ae6adb95 100644
--- a/module/apmchi/doc.go
+++ b/module/apmchi/doc.go
@@ -17,4 +17,4 @@
 
 // Package apmchi provides middleware for the Chi router,
 // for tracing HTTP requests.
-package apmchi
+package apmchi // import "go.elastic.co/apm/module/apmchi"
diff --git a/module/apmchi/middleware.go b/module/apmchi/middleware.go
index ce1dbd533..9d2d980e8 100644
--- a/module/apmchi/middleware.go
+++ b/module/apmchi/middleware.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmchi
+package apmchi // import "go.elastic.co/apm/module/apmchi"
 
 import (
 	"net/http"
diff --git a/module/apmecho/doc.go b/module/apmecho/doc.go
index 46e038e22..d618b512a 100644
--- a/module/apmecho/doc.go
+++ b/module/apmecho/doc.go
@@ -17,4 +17,4 @@
 
 // Package apmecho provides middleware for the Echo framework,
 // for tracing HTTP requests.
-package apmecho
+package apmecho // import "go.elastic.co/apm/module/apmecho"
diff --git a/module/apmecho/middleware.go b/module/apmecho/middleware.go
index 3a4eca13b..5c7c06181 100644
--- a/module/apmecho/middleware.go
+++ b/module/apmecho/middleware.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmecho
+package apmecho // import "go.elastic.co/apm/module/apmecho"
 
 import (
 	"errors"
diff --git a/module/apmechov4/doc.go b/module/apmechov4/doc.go
index 24e9a6700..4fa271cdd 100644
--- a/module/apmechov4/doc.go
+++ b/module/apmechov4/doc.go
@@ -19,4 +19,4 @@
 
 // Package apmechov4 provides middleware for the version 4 of Echo framework,
 // for tracing HTTP requests.
-package apmechov4
+package apmechov4 // import "go.elastic.co/apm/module/apmechov4"
diff --git a/module/apmechov4/middleware.go b/module/apmechov4/middleware.go
index 5ede3d346..8cc405abf 100644
--- a/module/apmechov4/middleware.go
+++ b/module/apmechov4/middleware.go
@@ -17,7 +17,7 @@
 
 // +build go1.9
 
-package apmechov4
+package apmechov4 // import "go.elastic.co/apm/module/apmechov4"
 
 import (
 	"errors"
diff --git a/module/apmelasticsearch/client.go b/module/apmelasticsearch/client.go
index 9e45ae66b..e5f49876c 100644
--- a/module/apmelasticsearch/client.go
+++ b/module/apmelasticsearch/client.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmelasticsearch
+package apmelasticsearch // import "go.elastic.co/apm/module/apmelasticsearch"
 
 import (
 	"bytes"
diff --git a/module/apmelasticsearch/doc.go b/module/apmelasticsearch/doc.go
index 066dd0b90..a93c00f8c 100644
--- a/module/apmelasticsearch/doc.go
+++ b/module/apmelasticsearch/doc.go
@@ -17,4 +17,4 @@
 
 // Package apmelasticsearch provides support for tracing the
 // HTTP transport layer of Elasticsearch clients.
-package apmelasticsearch
+package apmelasticsearch // import "go.elastic.co/apm/module/apmelasticsearch"
diff --git a/module/apmelasticsearch/requestname.go b/module/apmelasticsearch/requestname.go
index 5dbb7d7be..1e3546d11 100644
--- a/module/apmelasticsearch/requestname.go
+++ b/module/apmelasticsearch/requestname.go
@@ -17,7 +17,7 @@
 
 // +build go1.10
 
-package apmelasticsearch
+package apmelasticsearch // import "go.elastic.co/apm/module/apmelasticsearch"
 
 import (
 	"net/http"
diff --git a/module/apmelasticsearch/requestname_go19.go b/module/apmelasticsearch/requestname_go19.go
index 14c3bc697..953b6b2af 100644
--- a/module/apmelasticsearch/requestname_go19.go
+++ b/module/apmelasticsearch/requestname_go19.go
@@ -17,7 +17,7 @@
 
 // +build !go1.10
 
-package apmelasticsearch
+package apmelasticsearch // import "go.elastic.co/apm/module/apmelasticsearch"
 
 import (
 	"fmt"
diff --git a/module/apmgin/doc.go b/module/apmgin/doc.go
index 4bd40c7b3..d4389592c 100644
--- a/module/apmgin/doc.go
+++ b/module/apmgin/doc.go
@@ -17,4 +17,4 @@
 
 // Package apmgin provides middleware for the Gin framework,
 // for tracing HTTP requests.
-package apmgin
+package apmgin // import "go.elastic.co/apm/module/apmgin"
diff --git a/module/apmgin/middleware.go b/module/apmgin/middleware.go
index 9b847dbf4..d84d6dfab 100644
--- a/module/apmgin/middleware.go
+++ b/module/apmgin/middleware.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmgin
+package apmgin // import "go.elastic.co/apm/module/apmgin"
 
 import (
 	"net/http"
diff --git a/module/apmgocql/doc.go b/module/apmgocql/doc.go
index b2d370ea3..0cb16690b 100644
--- a/module/apmgocql/doc.go
+++ b/module/apmgocql/doc.go
@@ -18,4 +18,4 @@
 // +build go1.9
 
 // Package apmgocql provides an observer for tracing gocql (Cassandra) query spans.
-package apmgocql
+package apmgocql // import "go.elastic.co/apm/module/apmgocql"
diff --git a/module/apmgocql/observer.go b/module/apmgocql/observer.go
index c0ab115e4..cb1d52749 100644
--- a/module/apmgocql/observer.go
+++ b/module/apmgocql/observer.go
@@ -17,7 +17,7 @@
 
 // +build go1.9
 
-package apmgocql
+package apmgocql // import "go.elastic.co/apm/module/apmgocql"
 
 import (
 	"context"
diff --git a/module/apmgocql/signature.go b/module/apmgocql/signature.go
index 5cd27e5eb..4214f53da 100644
--- a/module/apmgocql/signature.go
+++ b/module/apmgocql/signature.go
@@ -17,7 +17,7 @@
 
 // +build go1.9
 
-package apmgocql
+package apmgocql // import "go.elastic.co/apm/module/apmgocql"
 
 import (
 	"strings"
diff --git a/module/apmgokit/doc.go b/module/apmgokit/doc.go
index a28cc6a8b..6b2d7b340 100644
--- a/module/apmgokit/doc.go
+++ b/module/apmgokit/doc.go
@@ -28,4 +28,4 @@
 //
 // Go kit-based gRPC servers and clients can both be wrapped
 // using the interceptors provided in module/apmgrpc.
-package apmgokit
+package apmgokit // import "go.elastic.co/apm/module/apmgokit"
diff --git a/module/apmgometrics/gatherer.go b/module/apmgometrics/gatherer.go
index e4ef82010..cf561ca8a 100644
--- a/module/apmgometrics/gatherer.go
+++ b/module/apmgometrics/gatherer.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmgometrics
+package apmgometrics // import "go.elastic.co/apm/module/apmgometrics"
 
 import (
 	"context"
diff --git a/module/apmgopg/doc.go b/module/apmgopg/doc.go
index 1d7002159..9b95160d3 100644
--- a/module/apmgopg/doc.go
+++ b/module/apmgopg/doc.go
@@ -18,4 +18,4 @@
 // +build go1.11
 
 // Package apmgopg provides wrappers for tracing go-pg operations.
-package apmgopg
+package apmgopg // import "go.elastic.co/apm/module/apmgopg"
diff --git a/module/apmgopg/hook.go b/module/apmgopg/hook.go
index 697cb878e..a362b1b51 100644
--- a/module/apmgopg/hook.go
+++ b/module/apmgopg/hook.go
@@ -17,7 +17,7 @@
 
 // +build go1.11
 
-package apmgopg
+package apmgopg // import "go.elastic.co/apm/module/apmgopg"
 
 import (
 	"errors"
diff --git a/module/apmgoredis/client.go b/module/apmgoredis/client.go
index 55df62c23..660a34295 100644
--- a/module/apmgoredis/client.go
+++ b/module/apmgoredis/client.go
@@ -17,7 +17,7 @@
 
 // +build go1.11
 
-package apmgoredis
+package apmgoredis // import "go.elastic.co/apm/module/apmgoredis"
 
 import (
 	"context"
diff --git a/module/apmgoredis/doc.go b/module/apmgoredis/doc.go
index 17374d7d7..9c05220c0 100644
--- a/module/apmgoredis/doc.go
+++ b/module/apmgoredis/doc.go
@@ -18,4 +18,4 @@
 // +build go1.11
 
 // Package apmgoredis provides helpers for tracing github.com/go-redis/redis client operations as spans.
-package apmgoredis
+package apmgoredis // import "go.elastic.co/apm/module/apmgoredis"
diff --git a/module/apmgoredisv8/doc.go b/module/apmgoredisv8/doc.go
index 8199a85de..e43d73d90 100644
--- a/module/apmgoredisv8/doc.go
+++ b/module/apmgoredisv8/doc.go
@@ -18,4 +18,4 @@
 // +build go1.11
 
 // Package apmgoredisv8 provides helpers for tracing github.com/go-redis/redis/v8 client operations as spans.
-package apmgoredisv8
+package apmgoredisv8 // import "go.elastic.co/apm/module/apmgoredisv8"
diff --git a/module/apmgoredisv8/hook.go b/module/apmgoredisv8/hook.go
index af7cdaf12..5e595571b 100644
--- a/module/apmgoredisv8/hook.go
+++ b/module/apmgoredisv8/hook.go
@@ -17,7 +17,7 @@
 
 // +build go1.11
 
-package apmgoredisv8
+package apmgoredisv8 // import "go.elastic.co/apm/module/apmgoredisv8"
 
 import (
 	"bytes"
diff --git a/module/apmgorilla/context.go b/module/apmgorilla/context.go
index 00a67f67f..e495f3b03 100644
--- a/module/apmgorilla/context.go
+++ b/module/apmgorilla/context.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmgorilla
+package apmgorilla // import "go.elastic.co/apm/module/apmgorilla"
 
 import (
 	"bytes"
diff --git a/module/apmgorilla/middleware.go b/module/apmgorilla/middleware.go
index 8d88f1778..3ed76942a 100644
--- a/module/apmgorilla/middleware.go
+++ b/module/apmgorilla/middleware.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmgorilla
+package apmgorilla // import "go.elastic.co/apm/module/apmgorilla"
 
 import (
 	"net/http"
diff --git a/module/apmgorm/context.go b/module/apmgorm/context.go
index 12f03112c..b74187fa8 100644
--- a/module/apmgorm/context.go
+++ b/module/apmgorm/context.go
@@ -17,7 +17,7 @@
 
 // +build go1.9
 
-package apmgorm
+package apmgorm // import "go.elastic.co/apm/module/apmgorm"
 
 import (
 	"context"
diff --git a/module/apmgorm/dialects/mysql/init.go b/module/apmgorm/dialects/mysql/init.go
index ba065dd85..e65499776 100644
--- a/module/apmgorm/dialects/mysql/init.go
+++ b/module/apmgorm/dialects/mysql/init.go
@@ -17,7 +17,7 @@
 
 // Package apmgormmysql imports the gorm mysql dialect package,
 // and also registers the mysql driver with apmsql.
-package apmgormmysql
+package apmgormmysql // import "go.elastic.co/apm/module/apmgorm/dialects/mysql"
 
 import (
 	_ "github.com/jinzhu/gorm/dialects/mysql" // import the mysql dialect
diff --git a/module/apmgorm/dialects/postgres/init.go b/module/apmgorm/dialects/postgres/init.go
index 6cdd28ae2..5148ff4b9 100644
--- a/module/apmgorm/dialects/postgres/init.go
+++ b/module/apmgorm/dialects/postgres/init.go
@@ -17,7 +17,7 @@
 
 // Package apmgormpostgres imports the gorm postgres dialect package,
 // and also registers the lib/pq driver with apmsql.
-package apmgormpostgres
+package apmgormpostgres // import "go.elastic.co/apm/module/apmgorm/dialects/postgres"
 
 import (
 	_ "github.com/jinzhu/gorm/dialects/postgres" // import the postgres dialect
diff --git a/module/apmgorm/dialects/sqlite/init.go b/module/apmgorm/dialects/sqlite/init.go
index 98e257dc6..8d8b15385 100644
--- a/module/apmgorm/dialects/sqlite/init.go
+++ b/module/apmgorm/dialects/sqlite/init.go
@@ -17,7 +17,7 @@
 
 // Package apmgormsqlite imports the gorm sqlite dialect package,
 // and also registers the sqlite3 driver with apmsql.
-package apmgormsqlite
+package apmgormsqlite // import "go.elastic.co/apm/module/apmgorm/dialects/sqlite"
 
 import (
 	_ "github.com/jinzhu/gorm/dialects/sqlite" // import the sqlite dialect
diff --git a/module/apmgorm/doc.go b/module/apmgorm/doc.go
index e06c5d539..a9fe24cb1 100644
--- a/module/apmgorm/doc.go
+++ b/module/apmgorm/doc.go
@@ -18,4 +18,4 @@
 // +build go1.9
 
 // Package apmgorm provides wrappers for tracing GORM operations.
-package apmgorm
+package apmgorm // import "go.elastic.co/apm/module/apmgorm"
diff --git a/module/apmgorm/open.go b/module/apmgorm/open.go
index cb11116b5..cb2118762 100644
--- a/module/apmgorm/open.go
+++ b/module/apmgorm/open.go
@@ -17,7 +17,7 @@
 
 // +build go1.9
 
-package apmgorm
+package apmgorm // import "go.elastic.co/apm/module/apmgorm"
 
 import (
 	"github.com/jinzhu/gorm"
diff --git a/module/apmgormv2/doc.go b/module/apmgormv2/doc.go
index a0056afa5..4b9ebb414 100644
--- a/module/apmgormv2/doc.go
+++ b/module/apmgormv2/doc.go
@@ -16,4 +16,4 @@
 // under the License.
 
 // Package apmgormv2 provides wrappers for tracing GORM operations.
-package apmgormv2
+package apmgormv2 // import "go.elastic.co/apm/module/apmgormv2"
diff --git a/module/apmgormv2/driver/mysql/init.go b/module/apmgormv2/driver/mysql/init.go
index 21e4a42af..0ebf3972d 100644
--- a/module/apmgormv2/driver/mysql/init.go
+++ b/module/apmgormv2/driver/mysql/init.go
@@ -19,7 +19,7 @@
 
 // Package apmmysql imports the gorm mysql dialect package,
 // and also registers the mysql driver with apmsql.
-package apmmysql
+package apmmysql // import "go.elastic.co/apm/module/apmgormv2/driver/mysql"
 
 import (
 	"gorm.io/driver/mysql"
diff --git a/module/apmgormv2/driver/postgres/init.go b/module/apmgormv2/driver/postgres/init.go
index 493d672e8..f7eddd7cd 100644
--- a/module/apmgormv2/driver/postgres/init.go
+++ b/module/apmgormv2/driver/postgres/init.go
@@ -19,7 +19,7 @@
 
 // Package apmpostgres imports the gorm mysql dialect package,
 // and also registers the mysql driver with apmsql.
-package apmpostgres
+package apmpostgres // import "go.elastic.co/apm/module/apmgormv2/driver/postgres"
 
 import (
 	"gorm.io/driver/postgres"
diff --git a/module/apmgormv2/driver/sqlite/init.go b/module/apmgormv2/driver/sqlite/init.go
index 517d59aa5..ac6745499 100644
--- a/module/apmgormv2/driver/sqlite/init.go
+++ b/module/apmgormv2/driver/sqlite/init.go
@@ -19,7 +19,7 @@
 
 // Package apmsqlite imports the gorm sqlite dialect package,
 // and also registers the sqlite3 driver with apmsql.
-package apmsqlite
+package apmsqlite // import "go.elastic.co/apm/module/apmgormv2/driver/sqlite"
 
 import (
 	"gorm.io/driver/sqlite"
diff --git a/module/apmgrpc/client.go b/module/apmgrpc/client.go
index bcbd33991..c084a5e16 100644
--- a/module/apmgrpc/client.go
+++ b/module/apmgrpc/client.go
@@ -17,7 +17,7 @@
 
 // +build go1.9
 
-package apmgrpc
+package apmgrpc // import "go.elastic.co/apm/module/apmgrpc"
 
 import (
 	"golang.org/x/net/context"
diff --git a/module/apmgrpc/doc.go b/module/apmgrpc/doc.go
index 85633aeed..e4c140045 100644
--- a/module/apmgrpc/doc.go
+++ b/module/apmgrpc/doc.go
@@ -18,4 +18,4 @@
 // +build go1.9
 
 // Package apmgrpc provides interceptors for tracing gRPC.
-package apmgrpc
+package apmgrpc // import "go.elastic.co/apm/module/apmgrpc"
diff --git a/module/apmgrpc/ignorer.go b/module/apmgrpc/ignorer.go
index f5e0a5526..030176040 100644
--- a/module/apmgrpc/ignorer.go
+++ b/module/apmgrpc/ignorer.go
@@ -17,7 +17,7 @@
 
 // +build go1.9
 
-package apmgrpc
+package apmgrpc // import "go.elastic.co/apm/module/apmgrpc"
 
 import (
 	"regexp"
diff --git a/module/apmgrpc/packages.go b/module/apmgrpc/packages.go
index c8d0c577b..47e8f9891 100644
--- a/module/apmgrpc/packages.go
+++ b/module/apmgrpc/packages.go
@@ -17,7 +17,7 @@
 
 // +build go1.9
 
-package apmgrpc
+package apmgrpc // import "go.elastic.co/apm/module/apmgrpc"
 
 import "go.elastic.co/apm/stacktrace"
 
diff --git a/module/apmgrpc/server.go b/module/apmgrpc/server.go
index 5187ec3d1..38b74329c 100644
--- a/module/apmgrpc/server.go
+++ b/module/apmgrpc/server.go
@@ -17,7 +17,7 @@
 
 // +build go1.9
 
-package apmgrpc
+package apmgrpc // import "go.elastic.co/apm/module/apmgrpc"
 
 import (
 	"strings"
diff --git a/module/apmhttp/client.go b/module/apmhttp/client.go
index 322f19232..e29846502 100644
--- a/module/apmhttp/client.go
+++ b/module/apmhttp/client.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmhttp
+package apmhttp // import "go.elastic.co/apm/module/apmhttp"
 
 import (
 	"io"
diff --git a/module/apmhttp/clienttrace.go b/module/apmhttp/clienttrace.go
index 0f1018677..1e7818249 100644
--- a/module/apmhttp/clienttrace.go
+++ b/module/apmhttp/clienttrace.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmhttp
+package apmhttp // import "go.elastic.co/apm/module/apmhttp"
 
 import (
 	"context"
diff --git a/module/apmhttp/context.go b/module/apmhttp/context.go
index 00c450eba..faeafb628 100644
--- a/module/apmhttp/context.go
+++ b/module/apmhttp/context.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmhttp
+package apmhttp // import "go.elastic.co/apm/module/apmhttp"
 
 import (
 	"fmt"
diff --git a/module/apmhttp/doc.go b/module/apmhttp/doc.go
index 659281bad..5ddfec9fa 100644
--- a/module/apmhttp/doc.go
+++ b/module/apmhttp/doc.go
@@ -17,4 +17,4 @@
 
 // Package apmhttp provides a tracing middleware http.Handler for
 // servers, and a tracing http.RoundTripper for clients.
-package apmhttp
+package apmhttp // import "go.elastic.co/apm/module/apmhttp"
diff --git a/module/apmhttp/handler.go b/module/apmhttp/handler.go
index 57536f6f8..aa4a484b1 100644
--- a/module/apmhttp/handler.go
+++ b/module/apmhttp/handler.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmhttp
+package apmhttp // import "go.elastic.co/apm/module/apmhttp"
 
 import (
 	"context"
diff --git a/module/apmhttp/ignorer.go b/module/apmhttp/ignorer.go
index 10ed81def..28b1145ad 100644
--- a/module/apmhttp/ignorer.go
+++ b/module/apmhttp/ignorer.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmhttp
+package apmhttp // import "go.elastic.co/apm/module/apmhttp"
 
 import (
 	"net/http"
diff --git a/module/apmhttp/recovery.go b/module/apmhttp/recovery.go
index 988769c14..c27db3c7b 100644
--- a/module/apmhttp/recovery.go
+++ b/module/apmhttp/recovery.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmhttp
+package apmhttp // import "go.elastic.co/apm/module/apmhttp"
 
 import (
 	"net/http"
diff --git a/module/apmhttp/requestname.go b/module/apmhttp/requestname.go
index 877aac153..6ca9333f1 100644
--- a/module/apmhttp/requestname.go
+++ b/module/apmhttp/requestname.go
@@ -17,7 +17,7 @@
 
 // +build go1.10
 
-package apmhttp
+package apmhttp // import "go.elastic.co/apm/module/apmhttp"
 
 import (
 	"net/http"
diff --git a/module/apmhttp/requestname_go19.go b/module/apmhttp/requestname_go19.go
index 2a84ec759..856f69ca3 100644
--- a/module/apmhttp/requestname_go19.go
+++ b/module/apmhttp/requestname_go19.go
@@ -17,7 +17,7 @@
 
 // +build !go1.10
 
-package apmhttp
+package apmhttp // import "go.elastic.co/apm/module/apmhttp"
 
 import "net/http"
 
diff --git a/module/apmhttp/traceheaders.go b/module/apmhttp/traceheaders.go
index 8a00a70db..1549e907c 100644
--- a/module/apmhttp/traceheaders.go
+++ b/module/apmhttp/traceheaders.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmhttp
+package apmhttp // import "go.elastic.co/apm/module/apmhttp"
 
 import (
 	"encoding/hex"
diff --git a/module/apmhttprouter/handler.go b/module/apmhttprouter/handler.go
index f1b1c790d..aa48027bf 100644
--- a/module/apmhttprouter/handler.go
+++ b/module/apmhttprouter/handler.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmhttprouter
+package apmhttprouter // import "go.elastic.co/apm/module/apmhttprouter"
 
 import (
 	"net/http"
diff --git a/module/apmhttprouter/router.go b/module/apmhttprouter/router.go
index b6afea3e8..a6bfcfd06 100644
--- a/module/apmhttprouter/router.go
+++ b/module/apmhttprouter/router.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmhttprouter
+package apmhttprouter // import "go.elastic.co/apm/module/apmhttprouter"
 
 import (
 	"context"
diff --git a/module/apmlambda/doc.go b/module/apmlambda/doc.go
index 041019016..6dd64f4b7 100644
--- a/module/apmlambda/doc.go
+++ b/module/apmlambda/doc.go
@@ -16,4 +16,4 @@
 // under the License.
 
 // Package apmlambda provides tracing for AWS Lambda functions.
-package apmlambda
+package apmlambda // import "go.elastic.co/apm/module/apmlambda"
diff --git a/module/apmlambda/lambda.go b/module/apmlambda/lambda.go
index 5398816c0..f6dd316ef 100644
--- a/module/apmlambda/lambda.go
+++ b/module/apmlambda/lambda.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmlambda
+package apmlambda // import "go.elastic.co/apm/module/apmlambda"
 
 import (
 	"log"
diff --git a/module/apmlogrus/fields.go b/module/apmlogrus/fields.go
index df8912369..b464e9929 100644
--- a/module/apmlogrus/fields.go
+++ b/module/apmlogrus/fields.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmlogrus
+package apmlogrus // import "go.elastic.co/apm/module/apmlogrus"
 
 import (
 	"context"
diff --git a/module/apmlogrus/hook.go b/module/apmlogrus/hook.go
index 02db188ce..7309a79be 100644
--- a/module/apmlogrus/hook.go
+++ b/module/apmlogrus/hook.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmlogrus
+package apmlogrus // import "go.elastic.co/apm/module/apmlogrus"
 
 import (
 	"context"
diff --git a/module/apmmongo/doc.go b/module/apmmongo/doc.go
index 55c73099c..bb19b24d2 100644
--- a/module/apmmongo/doc.go
+++ b/module/apmmongo/doc.go
@@ -17,4 +17,4 @@
 
 // Package apmmongo provides a CommandMonitor implementation
 // for tracing Mongo commands.
-package apmmongo
+package apmmongo // import "go.elastic.co/apm/module/apmmongo"
diff --git a/module/apmmongo/monitor.go b/module/apmmongo/monitor.go
index efb66e011..22a949bda 100644
--- a/module/apmmongo/monitor.go
+++ b/module/apmmongo/monitor.go
@@ -17,7 +17,7 @@
 
 // +build go1.10
 
-package apmmongo
+package apmmongo // import "go.elastic.co/apm/module/apmmongo"
 
 import (
 	"context"
diff --git a/module/apmnegroni/middleware.go b/module/apmnegroni/middleware.go
index c814a3ce7..b006632c7 100644
--- a/module/apmnegroni/middleware.go
+++ b/module/apmnegroni/middleware.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmnegroni
+package apmnegroni // import "go.elastic.co/apm/module/apmnegroni"
 
 import (
 	"context"
diff --git a/module/apmot/context.go b/module/apmot/context.go
index 6bc300558..1cb0c5dad 100644
--- a/module/apmot/context.go
+++ b/module/apmot/context.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmot
+package apmot // import "go.elastic.co/apm/module/apmot"
 
 import (
 	"time"
diff --git a/module/apmot/doc.go b/module/apmot/doc.go
index 259ef4a7a..647ef022e 100644
--- a/module/apmot/doc.go
+++ b/module/apmot/doc.go
@@ -21,4 +21,4 @@
 //  - binary propagation format
 //  - baggage
 //  - logging (generally; errors are reported)
-package apmot
+package apmot // import "go.elastic.co/apm/module/apmot"
diff --git a/module/apmot/log.go b/module/apmot/log.go
index 27c03282f..e9686d604 100644
--- a/module/apmot/log.go
+++ b/module/apmot/log.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmot
+package apmot // import "go.elastic.co/apm/module/apmot"
 
 import (
 	"time"
diff --git a/module/apmot/span.go b/module/apmot/span.go
index c03768dc2..54d4d2825 100644
--- a/module/apmot/span.go
+++ b/module/apmot/span.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmot
+package apmot // import "go.elastic.co/apm/module/apmot"
 
 import (
 	"fmt"
diff --git a/module/apmot/tracer.go b/module/apmot/tracer.go
index 9d477fe2e..b6bd25fcc 100644
--- a/module/apmot/tracer.go
+++ b/module/apmot/tracer.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmot
+package apmot // import "go.elastic.co/apm/module/apmot"
 
 import (
 	"io"
diff --git a/module/apmot/wrapper.go b/module/apmot/wrapper.go
index ed15b0776..073be1ed9 100644
--- a/module/apmot/wrapper.go
+++ b/module/apmot/wrapper.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmot
+package apmot // import "go.elastic.co/apm/module/apmot"
 
 import (
 	"context"
diff --git a/module/apmprometheus/gatherer.go b/module/apmprometheus/gatherer.go
index 6f9f96c7d..3409e1f95 100644
--- a/module/apmprometheus/gatherer.go
+++ b/module/apmprometheus/gatherer.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmprometheus
+package apmprometheus // import "go.elastic.co/apm/module/apmprometheus"
 
 import (
 	"context"
diff --git a/module/apmredigo/conn.go b/module/apmredigo/conn.go
index 1a9efe62b..fa616d5ea 100644
--- a/module/apmredigo/conn.go
+++ b/module/apmredigo/conn.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmredigo
+package apmredigo // import "go.elastic.co/apm/module/apmredigo"
 
 import (
 	"context"
diff --git a/module/apmredigo/doc.go b/module/apmredigo/doc.go
index 045936ab7..fb9e2a1e8 100644
--- a/module/apmredigo/doc.go
+++ b/module/apmredigo/doc.go
@@ -16,4 +16,4 @@
 // under the License.
 
 // Package apmredigo provides helpers for tracing github.com/gomodule/redigo/redis client operations as spans.
-package apmredigo
+package apmredigo // import "go.elastic.co/apm/module/apmredigo"
diff --git a/module/apmrestful/doc.go b/module/apmrestful/doc.go
index 093f683d5..6b380d92a 100644
--- a/module/apmrestful/doc.go
+++ b/module/apmrestful/doc.go
@@ -17,4 +17,4 @@
 
 // Package apmrestful provides a tracing and panic/exception
 // reporting filter for for the go-restful framework.
-package apmrestful
+package apmrestful // import "go.elastic.co/apm/module/apmrestful"
diff --git a/module/apmrestful/filter.go b/module/apmrestful/filter.go
index ba09ea056..fd6b3410d 100644
--- a/module/apmrestful/filter.go
+++ b/module/apmrestful/filter.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmrestful
+package apmrestful // import "go.elastic.co/apm/module/apmrestful"
 
 import (
 	"net/http"
diff --git a/module/apmrestful/route.go b/module/apmrestful/route.go
index 6c01a065d..f911c762b 100644
--- a/module/apmrestful/route.go
+++ b/module/apmrestful/route.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmrestful
+package apmrestful // import "go.elastic.co/apm/module/apmrestful"
 
 import (
 	"bytes"
diff --git a/module/apmsql/conn.go b/module/apmsql/conn.go
index afc64c618..4ab61bc5b 100644
--- a/module/apmsql/conn.go
+++ b/module/apmsql/conn.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmsql
+package apmsql // import "go.elastic.co/apm/module/apmsql"
 
 import (
 	"context"
diff --git a/module/apmsql/conn_go110.go b/module/apmsql/conn_go110.go
index 35fa0145d..e5afb5e24 100644
--- a/module/apmsql/conn_go110.go
+++ b/module/apmsql/conn_go110.go
@@ -17,7 +17,7 @@
 
 // +build go1.10
 
-package apmsql
+package apmsql // import "go.elastic.co/apm/module/apmsql"
 
 import (
 	"context"
diff --git a/module/apmsql/conn_go115.go b/module/apmsql/conn_go115.go
index a468be820..016f8c4c7 100644
--- a/module/apmsql/conn_go115.go
+++ b/module/apmsql/conn_go115.go
@@ -17,7 +17,7 @@
 
 // +build go1.15
 
-package apmsql
+package apmsql // import "go.elastic.co/apm/module/apmsql"
 
 import (
 	"database/sql/driver"
diff --git a/module/apmsql/conn_pre_go110.go b/module/apmsql/conn_pre_go110.go
index d16ab9a68..5ab49cd10 100644
--- a/module/apmsql/conn_pre_go110.go
+++ b/module/apmsql/conn_pre_go110.go
@@ -17,7 +17,7 @@
 
 // +build !go1.10
 
-package apmsql
+package apmsql // import "go.elastic.co/apm/module/apmsql"
 
 import "database/sql/driver"
 
diff --git a/module/apmsql/conn_pre_go115.go b/module/apmsql/conn_pre_go115.go
index 02fd3808b..75387deb4 100644
--- a/module/apmsql/conn_pre_go115.go
+++ b/module/apmsql/conn_pre_go115.go
@@ -17,7 +17,7 @@
 
 // +build !go1.15
 
-package apmsql
+package apmsql // import "go.elastic.co/apm/module/apmsql"
 
 import "database/sql/driver"
 
diff --git a/module/apmsql/doc.go b/module/apmsql/doc.go
index a7ba17262..6c555f347 100644
--- a/module/apmsql/doc.go
+++ b/module/apmsql/doc.go
@@ -16,4 +16,4 @@
 // under the License.
 
 // Package apmsql provides wrappers for tracing SQL query spans.
-package apmsql
+package apmsql // import "go.elastic.co/apm/module/apmsql"
diff --git a/module/apmsql/driver.go b/module/apmsql/driver.go
index 158470669..07c06da7e 100644
--- a/module/apmsql/driver.go
+++ b/module/apmsql/driver.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmsql
+package apmsql // import "go.elastic.co/apm/module/apmsql"
 
 import (
 	"database/sql"
diff --git a/module/apmsql/driver_go110.go b/module/apmsql/driver_go110.go
index 234ffde82..847c09471 100644
--- a/module/apmsql/driver_go110.go
+++ b/module/apmsql/driver_go110.go
@@ -17,7 +17,7 @@
 
 // +build go1.10
 
-package apmsql
+package apmsql // import "go.elastic.co/apm/module/apmsql"
 
 import (
 	"context"
diff --git a/module/apmsql/dsn.go b/module/apmsql/dsn.go
index 2ac83c837..18827c98b 100644
--- a/module/apmsql/dsn.go
+++ b/module/apmsql/dsn.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmsql
+package apmsql // import "go.elastic.co/apm/module/apmsql"
 
 // DSNInfo contains information from a database-specific data source name.
 type DSNInfo struct {
diff --git a/module/apmsql/gofuzz_signature.go b/module/apmsql/gofuzz_signature.go
index 4495c3aa3..d018b60fa 100644
--- a/module/apmsql/gofuzz_signature.go
+++ b/module/apmsql/gofuzz_signature.go
@@ -17,7 +17,7 @@
 
 // +build gofuzz
 
-package apmsql_test
+package apmsql_test // import "go.elastic.co/apm/module/apmsql"
 
 import (
 	"strings"
diff --git a/module/apmsql/mysql/doc.go b/module/apmsql/mysql/doc.go
index 35d6da527..7cdcab1f5 100644
--- a/module/apmsql/mysql/doc.go
+++ b/module/apmsql/mysql/doc.go
@@ -18,4 +18,4 @@
 // Package apmmysql registers the "mysql" driver with
 // apmsql, so that you can trace go-sql-driver/mysql
 // database connections.
-package apmmysql
+package apmmysql // import "go.elastic.co/apm/module/apmsql/mysql"
diff --git a/module/apmsql/mysql/init.go b/module/apmsql/mysql/init.go
index e7455a83f..cc6d186c6 100644
--- a/module/apmsql/mysql/init.go
+++ b/module/apmsql/mysql/init.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmmysql
+package apmmysql // import "go.elastic.co/apm/module/apmsql/mysql"
 
 import (
 	"github.com/go-sql-driver/mysql"
diff --git a/module/apmsql/mysql/parser.go b/module/apmsql/mysql/parser.go
index 49fc1651d..51267e4ac 100644
--- a/module/apmsql/mysql/parser.go
+++ b/module/apmsql/mysql/parser.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmmysql
+package apmmysql // import "go.elastic.co/apm/module/apmsql/mysql"
 
 import (
 	"net"
diff --git a/module/apmsql/pgxv4/doc.go b/module/apmsql/pgxv4/doc.go
index 329bdd9ab..db948187e 100644
--- a/module/apmsql/pgxv4/doc.go
+++ b/module/apmsql/pgxv4/doc.go
@@ -20,4 +20,4 @@
 
 // +build go1.14
 
-package apmpgxv4
+package apmpgxv4 // import "go.elastic.co/apm/module/apmsql/pgxv4"
diff --git a/module/apmsql/pgxv4/init.go b/module/apmsql/pgxv4/init.go
index 53902a252..1e84d5c25 100644
--- a/module/apmsql/pgxv4/init.go
+++ b/module/apmsql/pgxv4/init.go
@@ -17,7 +17,7 @@
 
 // +build go1.14
 
-package apmpgxv4
+package apmpgxv4 // import "go.elastic.co/apm/module/apmsql/pgxv4"
 
 import (
 	"github.com/jackc/pgx/v4/stdlib"
diff --git a/module/apmsql/pq/doc.go b/module/apmsql/pq/doc.go
index 82f280aec..425233f76 100644
--- a/module/apmsql/pq/doc.go
+++ b/module/apmsql/pq/doc.go
@@ -17,4 +17,4 @@
 
 // Package apmpq registers the "postgres" driver with
 // apmsql, so that you can trace lib/pq database connections.
-package apmpq
+package apmpq // import "go.elastic.co/apm/module/apmsql/pq"
diff --git a/module/apmsql/pq/init.go b/module/apmsql/pq/init.go
index f1eb1bf40..856841ba7 100644
--- a/module/apmsql/pq/init.go
+++ b/module/apmsql/pq/init.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmpq
+package apmpq // import "go.elastic.co/apm/module/apmsql/pq"
 
 import (
 	"github.com/lib/pq"
diff --git a/module/apmsql/pq/parser.go b/module/apmsql/pq/parser.go
index 78889b72c..a205c7c0c 100644
--- a/module/apmsql/pq/parser.go
+++ b/module/apmsql/pq/parser.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmpq
+package apmpq // import "go.elastic.co/apm/module/apmsql/pq"
 
 import (
 	"go.elastic.co/apm/module/apmsql"
diff --git a/module/apmsql/signature.go b/module/apmsql/signature.go
index 966a89c25..5601dc97d 100644
--- a/module/apmsql/signature.go
+++ b/module/apmsql/signature.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmsql
+package apmsql // import "go.elastic.co/apm/module/apmsql"
 
 import (
 	"strings"
diff --git a/module/apmsql/sqlite3/doc.go b/module/apmsql/sqlite3/doc.go
index a7c0827e7..037a3cc64 100644
--- a/module/apmsql/sqlite3/doc.go
+++ b/module/apmsql/sqlite3/doc.go
@@ -17,4 +17,4 @@
 
 // Package apmsqlite3 registers the "sqlite3" driver with
 // apmsql, so that you can trace sqlite3 database connections.
-package apmsqlite3
+package apmsqlite3 // import "go.elastic.co/apm/module/apmsql/sqlite3"
diff --git a/module/apmsql/sqlite3/init.go b/module/apmsql/sqlite3/init.go
index 3373a3ddd..bfb0e059b 100644
--- a/module/apmsql/sqlite3/init.go
+++ b/module/apmsql/sqlite3/init.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmsqlite3
+package apmsqlite3 // import "go.elastic.co/apm/module/apmsql/sqlite3"
 
 import (
 	sqlite3 "github.com/mattn/go-sqlite3"
diff --git a/module/apmsql/sqlite3/parser.go b/module/apmsql/sqlite3/parser.go
index 3b5530d48..412f9ef17 100644
--- a/module/apmsql/sqlite3/parser.go
+++ b/module/apmsql/sqlite3/parser.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmsqlite3
+package apmsqlite3 // import "go.elastic.co/apm/module/apmsql/sqlite3"
 
 import (
 	"strings"
diff --git a/module/apmsql/stmt.go b/module/apmsql/stmt.go
index 3249c66b3..b02a017b3 100644
--- a/module/apmsql/stmt.go
+++ b/module/apmsql/stmt.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmsql
+package apmsql // import "go.elastic.co/apm/module/apmsql"
 
 import (
 	"context"
diff --git a/module/apmsql/stmt_pre_go19.go b/module/apmsql/stmt_pre_go19.go
index 3b68ca44d..38eb6e581 100644
--- a/module/apmsql/stmt_pre_go19.go
+++ b/module/apmsql/stmt_pre_go19.go
@@ -17,7 +17,7 @@
 
 // +build !go1.9
 
-package apmsql
+package apmsql // import "go.elastic.co/apm/module/apmsql"
 
 import "database/sql/driver"
 
diff --git a/module/apmsql/utils.go b/module/apmsql/utils.go
index 093ed9334..9d14c967b 100644
--- a/module/apmsql/utils.go
+++ b/module/apmsql/utils.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmsql
+package apmsql // import "go.elastic.co/apm/module/apmsql"
 
 import (
 	"database/sql/driver"
diff --git a/module/apmzap/core.go b/module/apmzap/core.go
index 60d5fb6f9..fa51182e5 100644
--- a/module/apmzap/core.go
+++ b/module/apmzap/core.go
@@ -17,7 +17,7 @@
 
 // +build go1.9
 
-package apmzap
+package apmzap // import "go.elastic.co/apm/module/apmzap"
 
 import (
 	"context"
diff --git a/module/apmzap/fields.go b/module/apmzap/fields.go
index 99313c35d..f1ca8c9ee 100644
--- a/module/apmzap/fields.go
+++ b/module/apmzap/fields.go
@@ -17,7 +17,7 @@
 
 // +build go1.9
 
-package apmzap
+package apmzap // import "go.elastic.co/apm/module/apmzap"
 
 import (
 	"context"
diff --git a/module/apmzerolog/context.go b/module/apmzerolog/context.go
index d7c3ba566..29fec96da 100644
--- a/module/apmzerolog/context.go
+++ b/module/apmzerolog/context.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmzerolog
+package apmzerolog // import "go.elastic.co/apm/module/apmzerolog"
 
 import (
 	"context"
diff --git a/module/apmzerolog/doc.go b/module/apmzerolog/doc.go
index eb52db48f..bb1d0ce8e 100644
--- a/module/apmzerolog/doc.go
+++ b/module/apmzerolog/doc.go
@@ -18,4 +18,4 @@
 // Package apmzerolog provides an implementaton of zerolog.LevelWriter
 // for sending error records to Elastic APM, as well as functions for
 // adding trace context and detailed error stack traces to log records.
-package apmzerolog
+package apmzerolog // import "go.elastic.co/apm/module/apmzerolog"
diff --git a/module/apmzerolog/stack.go b/module/apmzerolog/stack.go
index db6f52c82..5fe11c8d4 100644
--- a/module/apmzerolog/stack.go
+++ b/module/apmzerolog/stack.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmzerolog
+package apmzerolog // import "go.elastic.co/apm/module/apmzerolog"
 
 import (
 	"strconv"
diff --git a/module/apmzerolog/writer.go b/module/apmzerolog/writer.go
index 0c9b0879d..0adab8430 100644
--- a/module/apmzerolog/writer.go
+++ b/module/apmzerolog/writer.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmzerolog
+package apmzerolog // import "go.elastic.co/apm/module/apmzerolog"
 
 import (
 	"bytes"
diff --git a/profiling.go b/profiling.go
index 42f2bb946..77350029f 100644
--- a/profiling.go
+++ b/profiling.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"bytes"
diff --git a/sampler.go b/sampler.go
index 88c254ad1..4a3d789d6 100644
--- a/sampler.go
+++ b/sampler.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"encoding/binary"
diff --git a/sanitizer.go b/sanitizer.go
index 7f9014840..6168c0b76 100644
--- a/sanitizer.go
+++ b/sanitizer.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"go.elastic.co/apm/internal/wildcard"
diff --git a/scripts/before_install.sh b/scripts/before_install.sh
index 484297092..6d3b9c65c 100755
--- a/scripts/before_install.sh
+++ b/scripts/before_install.sh
@@ -5,6 +5,7 @@ if (go run scripts/mingoversion.go 1.10 &>/dev/null); then
   go get -v golang.org/x/lint/golint;
   go get -v golang.org/x/tools/cmd/goimports;
   go get -v github.com/elastic/go-licenser;
+  go get -v github.com/jcchavezs/porto;
 fi
 
 # Pin various dependencies for old Go versions.
diff --git a/scripts/generate.go b/scripts/generate.go
index 48b602009..e820916ae 100644
--- a/scripts/generate.go
+++ b/scripts/generate.go
@@ -17,4 +17,4 @@
 
 //go:generate go run gendockerfile.go -base=..
 
-package scripts
+package scripts // import "go.elastic.co/apm/scripts"
diff --git a/span.go b/span.go
index 1fda02447..aac1649e8 100644
--- a/span.go
+++ b/span.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	cryptorand "crypto/rand"
diff --git a/spancontext.go b/spancontext.go
index d80b82f2b..86b4877b7 100644
--- a/spancontext.go
+++ b/spancontext.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"fmt"
diff --git a/stacktrace.go b/stacktrace.go
index 1fe5cda61..d801bb67f 100644
--- a/stacktrace.go
+++ b/stacktrace.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"path/filepath"
diff --git a/stacktrace/context.go b/stacktrace/context.go
index b9d292432..e7e307a76 100644
--- a/stacktrace/context.go
+++ b/stacktrace/context.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package stacktrace
+package stacktrace // import "go.elastic.co/apm/stacktrace"
 
 import (
 	"bufio"
diff --git a/stacktrace/doc.go b/stacktrace/doc.go
index f8cffa455..df0a9a6fa 100644
--- a/stacktrace/doc.go
+++ b/stacktrace/doc.go
@@ -17,4 +17,4 @@
 
 // Package stacktrace provides a simplified stack frame type,
 // functions for obtaining stack frames, and related utilities.
-package stacktrace
+package stacktrace // import "go.elastic.co/apm/stacktrace"
diff --git a/stacktrace/frame.go b/stacktrace/frame.go
index 1c5053a25..9ebeb363d 100644
--- a/stacktrace/frame.go
+++ b/stacktrace/frame.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package stacktrace
+package stacktrace // import "go.elastic.co/apm/stacktrace"
 
 // Frame describes a stack frame.
 type Frame struct {
diff --git a/stacktrace/stacktrace.go b/stacktrace/stacktrace.go
index a13356f06..c50d85bad 100644
--- a/stacktrace/stacktrace.go
+++ b/stacktrace/stacktrace.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package stacktrace
+package stacktrace // import "go.elastic.co/apm/stacktrace"
 
 import (
 	"runtime"
diff --git a/tracecontext.go b/tracecontext.go
index 5ea5d7354..37e34fd76 100644
--- a/tracecontext.go
+++ b/tracecontext.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"bytes"
diff --git a/tracer.go b/tracer.go
index f82d9fecd..36dc70ecc 100644
--- a/tracer.go
+++ b/tracer.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"bytes"
diff --git a/tracer_stats.go b/tracer_stats.go
index 6e1436e85..b8d729852 100644
--- a/tracer_stats.go
+++ b/tracer_stats.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 // TracerStats holds statistics for a Tracer.
 type TracerStats struct {
diff --git a/transaction.go b/transaction.go
index 60989512a..b5ac7cb33 100644
--- a/transaction.go
+++ b/transaction.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	cryptorand "crypto/rand"
diff --git a/transport/api.go b/transport/api.go
index a9c2fe263..5efe9315f 100644
--- a/transport/api.go
+++ b/transport/api.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package transport
+package transport // import "go.elastic.co/apm/transport"
 
 import (
 	"context"
diff --git a/transport/default.go b/transport/default.go
index 2a730eda6..41a23c520 100644
--- a/transport/default.go
+++ b/transport/default.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package transport
+package transport // import "go.elastic.co/apm/transport"
 
 var (
 	// Default is the default Transport, using the
diff --git a/transport/discard.go b/transport/discard.go
index 3d61a34da..46200c03c 100644
--- a/transport/discard.go
+++ b/transport/discard.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package transport
+package transport // import "go.elastic.co/apm/transport"
 
 import (
 	"context"
diff --git a/transport/doc.go b/transport/doc.go
index c5bf29e19..36276cebc 100644
--- a/transport/doc.go
+++ b/transport/doc.go
@@ -17,4 +17,4 @@
 
 // Package transport provides an interface and implementation
 // for transporting data to the Elastic APM server.
-package transport
+package transport // import "go.elastic.co/apm/transport"
diff --git a/transport/http.go b/transport/http.go
index d084a51d4..0810f6828 100644
--- a/transport/http.go
+++ b/transport/http.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package transport
+package transport // import "go.elastic.co/apm/transport"
 
 import (
 	"bytes"
diff --git a/transport/transporttest/doc.go b/transport/transporttest/doc.go
index 13f9e3adf..aa75b926c 100644
--- a/transport/transporttest/doc.go
+++ b/transport/transporttest/doc.go
@@ -17,4 +17,4 @@
 
 // Package transporttest provides implementations of
 // transport.Transport for testing purposes.
-package transporttest
+package transporttest // import "go.elastic.co/apm/transport/transporttest"
diff --git a/transport/transporttest/err.go b/transport/transporttest/err.go
index 668fff8a3..46a676eb8 100644
--- a/transport/transporttest/err.go
+++ b/transport/transporttest/err.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package transporttest
+package transporttest // import "go.elastic.co/apm/transport/transporttest"
 
 import (
 	"context"
diff --git a/transport/transporttest/recorder.go b/transport/transporttest/recorder.go
index 94e9726d0..7c99060f4 100644
--- a/transport/transporttest/recorder.go
+++ b/transport/transporttest/recorder.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package transporttest
+package transporttest // import "go.elastic.co/apm/transport/transporttest"
 
 import (
 	"compress/zlib"
diff --git a/utils.go b/utils.go
index 7f56be7ec..165e52ee5 100644
--- a/utils.go
+++ b/utils.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"context"
diff --git a/utils_go10.go b/utils_go10.go
index d2c1bbfc4..605400bd8 100644
--- a/utils_go10.go
+++ b/utils_go10.go
@@ -17,7 +17,7 @@
 
 // +build go1.10
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import "math"
 
diff --git a/utils_go9.go b/utils_go9.go
index 6ff880977..88268e375 100644
--- a/utils_go9.go
+++ b/utils_go9.go
@@ -17,7 +17,7 @@
 
 // +build !go1.10
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import "math"
 
diff --git a/utils_linux.go b/utils_linux.go
index abf97366a..a6f6fd66c 100644
--- a/utils_linux.go
+++ b/utils_linux.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"bytes"
diff --git a/utils_other.go b/utils_other.go
index 06a38c5d9..9be933bb9 100644
--- a/utils_other.go
+++ b/utils_other.go
@@ -17,7 +17,7 @@
 
 //+build !linux
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"github.com/pkg/errors"
diff --git a/version.go b/version.go
index 79ccdf0e4..5d6801cf5 100644
--- a/version.go
+++ b/version.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 const (
 	// AgentVersion is the Elastic APM Go Agent version.