diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ea389fc..4aadfd7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -316,8 +316,8 @@
 ## [0.1.0] - 2015-12-03
 - Initial release
 
-[0.3.1]: https://github.com/xenolf/lego/compare/v0.3.0...v0.3.1
-[0.3.0]: https://github.com/xenolf/lego/compare/v0.2.0...v0.3.0
-[0.2.0]: https://github.com/xenolf/lego/compare/v0.1.1...v0.2.0
-[0.1.1]: https://github.com/xenolf/lego/compare/v0.1.0...v0.1.1
-[0.1.0]: https://github.com/xenolf/lego/tree/v0.1.0
+[0.3.1]: https://github.com/go-acme/lego/compare/v0.3.0...v0.3.1
+[0.3.0]: https://github.com/go-acme/lego/compare/v0.2.0...v0.3.0
+[0.2.0]: https://github.com/go-acme/lego/compare/v0.1.1...v0.2.0
+[0.1.1]: https://github.com/go-acme/lego/compare/v0.1.0...v0.1.1
+[0.1.0]: https://github.com/go-acme/lego/tree/v0.1.0
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0f2ef95f..d558e778 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -44,8 +44,8 @@ cd $GOPATH/src/github.com/xenolf
 git clone git@github.com:YOUR_USERNAME/lego.git
 cd lego
 
-# Add the xenolf/lego remote
-git remote add upstream git@github.com:xenolf/lego.git
+# Add the go-acme/lego remote
+git remote add upstream git@github.com:go-acme/lego.git
 git fetch upstream
 ```
 
diff --git a/Makefile b/Makefile
index 88e25a1b..75c254ae 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 SRCS = $(shell git ls-files '*.go' | grep -v '^vendor/')
 
-LEGO_IMAGE := xenolf/lego
+LEGO_IMAGE := go-acme/lego
 MAIN_DIRECTORY := ./cmd/lego/
 BIN_OUTPUT := dist/lego
 
diff --git a/README.md b/README.md
index 9a2551d7..cb522690 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,9 @@
 
 Let's Encrypt client and ACME library written in Go.
 
-[![GoDoc](https://godoc.org/github.com/xenolf/lego?status.svg)](https://godoc.org/github.com/xenolf/lego/acme)
-[![Build Status](https://travis-ci.org/xenolf/lego.svg?branch=master)](https://travis-ci.org/xenolf/lego)
-[![Docker Pulls](https://img.shields.io/docker/pulls/xenolf/lego.svg)](https://hub.docker.com/r/xenolf/lego/)
-[![Dev Chat](https://img.shields.io/badge/dev%20chat-gitter-blue.svg?label=dev+chat)](https://gitter.im/xenolf/lego)
-[![Beerpay](https://beerpay.io/xenolf/lego/badge.svg)](https://beerpay.io/xenolf/lego)
+[![GoDoc](https://godoc.org/github.com/go-acme/lego?status.svg)](https://godoc.org/github.com/go-acme/lego/acme)
+[![Build Status](https://travis-ci.org/go-acme/lego.svg?branch=master)](https://travis-ci.org/go-acme/lego)
+[![Docker Pulls](https://img.shields.io/docker/pulls/go-acme/lego.svg)](https://hub.docker.com/r/go-acme/lego/)
 
 ## Features
 
@@ -19,43 +17,43 @@ Let's Encrypt client and ACME library written in Go.
   - DNS (dns-01)
   - TLS (tls-alpn-01)
 - SAN certificate support
-- Comes with multiple optional [DNS providers](https://github.com/xenolf/lego/tree/master/providers/dns)
-- [Custom challenge solvers](https://github.com/xenolf/lego/wiki/Writing-a-Challenge-Solver)
+- Comes with multiple optional [DNS providers](hhttps://go-acme.github.io/lego/dns)
+- [Custom challenge solvers](https://go-acme.github.io/lego/usage/library/writing-a-challenge-solver/)
 - Certificate bundling
 - OCSP helper function
 
-lego introduced support for ACME v2 in [v1.0.0](https://github.com/xenolf/lego/releases/tag/v1.0.0). If you still need to utilize ACME v1, you can do so by using the [v0.5.0](https://github.com/xenolf/lego/releases/tag/v0.5.0) version.
+lego introduced support for ACME v2 in [v1.0.0](https://github.com/go-acme/lego/releases/tag/v1.0.0). If you still need to utilize ACME v1, you can do so by using the [v0.5.0](https://github.com/go-acme/lego/releases/tag/v0.5.0) version.
 
 ## Installation
 
-How to [install](https://xenolf.github.io/lego/installation/).
+How to [install](https://go-acme.github.io/lego/installation/).
 
 ## Usage
 
-- as a [CLI](https://xenolf.github.io/lego/usage/cli)
-- as a [library](https://xenolf.github.io/lego/usage/lib)
+- as a [CLI](https://go-acme.github.io/lego/usage/cli)
+- as a [library](https://go-acme.github.io/lego/usage/lib)
 
 ## Documentation
 
-Documentation is hosted live at https://xenolf.github.io/lego/.
+Documentation is hosted live at https://go-acme.github.io/lego/.
 
 ## DNS providers
 
-Detailed documentation is available [here](https://xenolf.github.io/lego/dns).
+Detailed documentation is available [here](https://go-acme.github.io/lego/dns).
 
 |                                                                |                                                                                |                                                                   |                                                                  |
 |----------------------------------------------------------------|--------------------------------------------------------------------------------|-------------------------------------------------------------------|------------------------------------------------------------------|
-| [Alibaba Cloud DNS](https://xenolf.github.io/lego/dns/alidns/) | [Amazon Lightsail](https://xenolf.github.io/lego/dns/lightsail/)               | [Amazon Route 53](https://xenolf.github.io/lego/dns/route53/)     | [Aurora DNS](https://xenolf.github.io/lego/dns/auroradns/)       |
-| [Azure](https://xenolf.github.io/lego/dns/azure/)              | [Bluecat](https://xenolf.github.io/lego/dns/bluecat/)                          | [ClouDNS](https://xenolf.github.io/lego/dns/cloudns/)             | [CloudXNS](https://xenolf.github.io/lego/dns/cloudxns/)          |
-| [Cloudflare](https://xenolf.github.io/lego/dns/cloudflare/)    | [ConoHa](https://xenolf.github.io/lego/dns/conoha/)                            | [DNS Made Easy](https://xenolf.github.io/lego/dns/dnsmadeeasy/)   | [DNSPod](https://xenolf.github.io/lego/dns/dnspod/)              |
-| [DNSimple](https://xenolf.github.io/lego/dns/dnsimple/)        | [Designate DNSaaS for Openstack](https://xenolf.github.io/lego/dns/designate/) | [Digital Ocean](https://xenolf.github.io/lego/dns/digitalocean/)  | [DreamHost](https://xenolf.github.io/lego/dns/dreamhost/)        |
-| [Duck DNS](https://xenolf.github.io/lego/dns/duckdns/)         | [Dyn](https://xenolf.github.io/lego/dns/dyn/)                                  | [Exoscale](https://xenolf.github.io/lego/dns/exoscale/)           | [External program](https://xenolf.github.io/lego/dns/exec/)      |
-| [FastDNS](https://xenolf.github.io/lego/dns/fastdns/)          | [Gandi](https://xenolf.github.io/lego/dns/gandi/)                              | [Gandi Live DNS (v5)](https://xenolf.github.io/lego/dns/gandiv5/) | [Glesys](https://xenolf.github.io/lego/dns/glesys/)              |
-| [Go Daddy](https://xenolf.github.io/lego/dns/godaddy/)         | [Google Cloud](https://xenolf.github.io/lego/dns/gcloud/)                      | [HTTP request](https://xenolf.github.io/lego/dns/httpreq/)        | [Hosting.de](https://xenolf.github.io/lego/dns/hostingde/)       |
-| [INWX](https://xenolf.github.io/lego/dns/inwx/)                | [Internet Initiative Japan](https://xenolf.github.io/lego/dns/iij/)            | [Joohoi's ACME-DNS](https://xenolf.github.io/lego/dns/acme-dns)   | [Linode (deprecated)](https://xenolf.github.io/lego/dns/linode/) |
-| [Linode (v4)](https://xenolf.github.io/lego/dns/linodev4/)     | [Manual](https://xenolf.github.io/lego/dns/manual/)                            | [MyDNS.jp](https://xenolf.github.io/lego/dns/mydnsjp/)            | [NIFCloud](https://xenolf.github.io/lego/dns/nifcloud/)          |
-| [NS1](https://xenolf.github.io/lego/dns/ns1/)                  | [Name.com](https://xenolf.github.io/lego/dns/namedotcom/)                      | [Namecheap](https://xenolf.github.io/lego/dns/namecheap/)         | [Netcup](https://xenolf.github.io/lego/dns/netcup/)              |
-| [OVH](https://xenolf.github.io/lego/dns/ovh/)                  | [Open Telekom Cloud](https://xenolf.github.io/lego/dns/otc/)                   | [Oracle Cloud](https://xenolf.github.io/lego/dns/oraclecloud/)    | [PowerDNS](https://xenolf.github.io/lego/dns/pdns/)              |
-| [RFC2136](https://xenolf.github.io/lego/dns/rfc2136/)          | [Rackspace](https://xenolf.github.io/lego/dns/rackspace/)                      | [Sakura Cloud](https://xenolf.github.io/lego/dns/sakuracloud/)    | [Selectel](https://xenolf.github.io/lego/dns/selectel/)          |
-| [Stackpath](https://xenolf.github.io/lego/dns/stackpath/)      | [TransIP](https://xenolf.github.io/lego/dns/transip/)                          | [VegaDNS](https://xenolf.github.io/lego/dns/vegadns/)             | [Vscale](https://xenolf.github.io/lego/dns/vscale/)              |
-| [Vultr](https://xenolf.github.io/lego/dns/vultr/)              | [Zone.ee](https://xenolf.github.io/lego/dns/zoneee/)                           |                                                                   |                                                                  |
+| [Alibaba Cloud DNS](https://go-acme.github.io/lego/dns/alidns/) | [Amazon Lightsail](https://go-acme.github.io/lego/dns/lightsail/)               | [Amazon Route 53](https://go-acme.github.io/lego/dns/route53/)     | [Aurora DNS](https://go-acme.github.io/lego/dns/auroradns/)       |
+| [Azure](https://go-acme.github.io/lego/dns/azure/)              | [Bluecat](https://go-acme.github.io/lego/dns/bluecat/)                          | [ClouDNS](https://go-acme.github.io/lego/dns/cloudns/)             | [CloudXNS](https://go-acme.github.io/lego/dns/cloudxns/)          |
+| [Cloudflare](https://go-acme.github.io/lego/dns/cloudflare/)    | [ConoHa](https://go-acme.github.io/lego/dns/conoha/)                            | [DNS Made Easy](https://go-acme.github.io/lego/dns/dnsmadeeasy/)   | [DNSPod](https://go-acme.github.io/lego/dns/dnspod/)              |
+| [DNSimple](https://go-acme.github.io/lego/dns/dnsimple/)        | [Designate DNSaaS for Openstack](https://go-acme.github.io/lego/dns/designate/) | [Digital Ocean](https://go-acme.github.io/lego/dns/digitalocean/)  | [DreamHost](https://go-acme.github.io/lego/dns/dreamhost/)        |
+| [Duck DNS](https://go-acme.github.io/lego/dns/duckdns/)         | [Dyn](https://go-acme.github.io/lego/dns/dyn/)                                  | [Exoscale](https://go-acme.github.io/lego/dns/exoscale/)           | [External program](https://go-acme.github.io/lego/dns/exec/)      |
+| [FastDNS](https://go-acme.github.io/lego/dns/fastdns/)          | [Gandi](https://go-acme.github.io/lego/dns/gandi/)                              | [Gandi Live DNS (v5)](https://go-acme.github.io/lego/dns/gandiv5/) | [Glesys](https://go-acme.github.io/lego/dns/glesys/)              |
+| [Go Daddy](https://go-acme.github.io/lego/dns/godaddy/)         | [Google Cloud](https://go-acme.github.io/lego/dns/gcloud/)                      | [HTTP request](https://go-acme.github.io/lego/dns/httpreq/)        | [Hosting.de](https://go-acme.github.io/lego/dns/hostingde/)       |
+| [INWX](https://go-acme.github.io/lego/dns/inwx/)                | [Internet Initiative Japan](https://go-acme.github.io/lego/dns/iij/)            | [Joohoi's ACME-DNS](https://go-acme.github.io/lego/dns/acme-dns)   | [Linode (deprecated)](https://go-acme.github.io/lego/dns/linode/) |
+| [Linode (v4)](https://go-acme.github.io/lego/dns/linodev4/)     | [Manual](https://go-acme.github.io/lego/dns/manual/)                            | [MyDNS.jp](https://go-acme.github.io/lego/dns/mydnsjp/)            | [NIFCloud](https://go-acme.github.io/lego/dns/nifcloud/)          |
+| [NS1](https://go-acme.github.io/lego/dns/ns1/)                  | [Name.com](https://go-acme.github.io/lego/dns/namedotcom/)                      | [Namecheap](https://go-acme.github.io/lego/dns/namecheap/)         | [Netcup](https://go-acme.github.io/lego/dns/netcup/)              |
+| [OVH](https://go-acme.github.io/lego/dns/ovh/)                  | [Open Telekom Cloud](https://go-acme.github.io/lego/dns/otc/)                   | [Oracle Cloud](https://go-acme.github.io/lego/dns/oraclecloud/)    | [PowerDNS](https://go-acme.github.io/lego/dns/pdns/)              |
+| [RFC2136](https://go-acme.github.io/lego/dns/rfc2136/)          | [Rackspace](https://go-acme.github.io/lego/dns/rackspace/)                      | [Sakura Cloud](https://go-acme.github.io/lego/dns/sakuracloud/)    | [Selectel](https://go-acme.github.io/lego/dns/selectel/)          |
+| [Stackpath](https://go-acme.github.io/lego/dns/stackpath/)      | [TransIP](https://go-acme.github.io/lego/dns/transip/)                          | [VegaDNS](https://go-acme.github.io/lego/dns/vegadns/)             | [Vscale](https://go-acme.github.io/lego/dns/vscale/)              |
+| [Vultr](https://go-acme.github.io/lego/dns/vultr/)              | [Zone.ee](https://go-acme.github.io/lego/dns/zoneee/)                           |                                                                   |                                                                  |
diff --git a/acme/api/account.go b/acme/api/account.go
index 489be420..21edb6bf 100644
--- a/acme/api/account.go
+++ b/acme/api/account.go
@@ -1,4 +1,4 @@
-package api
+package api // import "github.com/xenolf/lego/acme/api"
 
 import (
 	"encoding/base64"
diff --git a/acme/api/api.go b/acme/api/api.go
index a62e49e4..85e1d17c 100644
--- a/acme/api/api.go
+++ b/acme/api/api.go
@@ -1,4 +1,4 @@
-package api
+package api // import "github.com/xenolf/lego/acme/api"
 
 import (
 	"bytes"
diff --git a/acme/api/authorization.go b/acme/api/authorization.go
index ed4a4867..9fc21ac9 100644
--- a/acme/api/authorization.go
+++ b/acme/api/authorization.go
@@ -1,4 +1,4 @@
-package api
+package api // import "github.com/xenolf/lego/acme/api"
 
 import (
 	"errors"
diff --git a/acme/api/certificate.go b/acme/api/certificate.go
index db939ae4..0b6d5cc5 100644
--- a/acme/api/certificate.go
+++ b/acme/api/certificate.go
@@ -1,4 +1,4 @@
-package api
+package api // import "github.com/xenolf/lego/acme/api"
 
 import (
 	"crypto/x509"
diff --git a/acme/api/certificate_test.go b/acme/api/certificate_test.go
index b76ec381..8f1dc24a 100644
--- a/acme/api/certificate_test.go
+++ b/acme/api/certificate_test.go
@@ -1,4 +1,4 @@
-package api
+package api // import "github.com/xenolf/lego/acme/api"
 
 import (
 	"crypto/rand"
diff --git a/acme/api/challenge.go b/acme/api/challenge.go
index afcd0aa2..30c50212 100644
--- a/acme/api/challenge.go
+++ b/acme/api/challenge.go
@@ -1,4 +1,4 @@
-package api
+package api // import "github.com/xenolf/lego/acme/api"
 
 import (
 	"errors"
diff --git a/acme/api/internal/nonces/nonce_manager.go b/acme/api/internal/nonces/nonce_manager.go
index 20a53010..b8b707a3 100644
--- a/acme/api/internal/nonces/nonce_manager.go
+++ b/acme/api/internal/nonces/nonce_manager.go
@@ -1,4 +1,4 @@
-package nonces
+package nonces // import "github.com/xenolf/lego/acme/api/internal/nonces"
 
 import (
 	"errors"
diff --git a/acme/api/internal/nonces/nonce_manager_test.go b/acme/api/internal/nonces/nonce_manager_test.go
index 7ec11b63..87af4bb2 100644
--- a/acme/api/internal/nonces/nonce_manager_test.go
+++ b/acme/api/internal/nonces/nonce_manager_test.go
@@ -1,4 +1,4 @@
-package nonces
+package nonces // import "github.com/xenolf/lego/acme/api/internal/nonces"
 
 import (
 	"net/http"
diff --git a/acme/api/internal/secure/jws.go b/acme/api/internal/secure/jws.go
index 6f26c4ea..b968f882 100644
--- a/acme/api/internal/secure/jws.go
+++ b/acme/api/internal/secure/jws.go
@@ -1,4 +1,4 @@
-package secure
+package secure // import "github.com/xenolf/lego/acme/api/internal/secure"
 
 import (
 	"crypto"
diff --git a/acme/api/internal/secure/jws_test.go b/acme/api/internal/secure/jws_test.go
index 8daa7737..12ccf5d6 100644
--- a/acme/api/internal/secure/jws_test.go
+++ b/acme/api/internal/secure/jws_test.go
@@ -1,4 +1,4 @@
-package secure
+package secure // import "github.com/xenolf/lego/acme/api/internal/secure"
 
 import (
 	"net/http"
diff --git a/acme/api/internal/sender/sender.go b/acme/api/internal/sender/sender.go
index 5e74e65f..05da73b7 100644
--- a/acme/api/internal/sender/sender.go
+++ b/acme/api/internal/sender/sender.go
@@ -1,4 +1,4 @@
-package sender
+package sender // import "github.com/xenolf/lego/acme/api/internal/sender"
 
 import (
 	"encoding/json"
diff --git a/acme/api/internal/sender/sender_test.go b/acme/api/internal/sender/sender_test.go
index 0ab02257..c5df7499 100644
--- a/acme/api/internal/sender/sender_test.go
+++ b/acme/api/internal/sender/sender_test.go
@@ -1,4 +1,4 @@
-package sender
+package sender // import "github.com/xenolf/lego/acme/api/internal/sender"
 
 import (
 	"net/http"
diff --git a/acme/api/internal/sender/useragent.go b/acme/api/internal/sender/useragent.go
index 9806fd1f..684651b8 100644
--- a/acme/api/internal/sender/useragent.go
+++ b/acme/api/internal/sender/useragent.go
@@ -1,4 +1,4 @@
-package sender
+package sender // import "github.com/xenolf/lego/acme/api/internal/sender"
 
 // CODE GENERATED AUTOMATICALLY
 // THIS FILE MUST NOT BE EDITED BY HAND
diff --git a/acme/api/order.go b/acme/api/order.go
index 40e05a25..53915ad8 100644
--- a/acme/api/order.go
+++ b/acme/api/order.go
@@ -1,4 +1,4 @@
-package api
+package api // import "github.com/xenolf/lego/acme/api"
 
 import (
 	"encoding/base64"
diff --git a/acme/api/order_test.go b/acme/api/order_test.go
index 31f92dc5..e6cdb2ad 100644
--- a/acme/api/order_test.go
+++ b/acme/api/order_test.go
@@ -1,4 +1,4 @@
-package api
+package api // import "github.com/xenolf/lego/acme/api"
 
 import (
 	"crypto/rand"
diff --git a/acme/api/service.go b/acme/api/service.go
index ff043bc7..f455dd25 100644
--- a/acme/api/service.go
+++ b/acme/api/service.go
@@ -1,4 +1,4 @@
-package api
+package api // import "github.com/xenolf/lego/acme/api"
 
 import (
 	"net/http"
diff --git a/acme/api/service_test.go b/acme/api/service_test.go
index d0095a13..faadf9e8 100644
--- a/acme/api/service_test.go
+++ b/acme/api/service_test.go
@@ -1,4 +1,4 @@
-package api
+package api // import "github.com/xenolf/lego/acme/api"
 
 import (
 	"net/http"
diff --git a/acme/commons.go b/acme/commons.go
index c4493696..72570400 100644
--- a/acme/commons.go
+++ b/acme/commons.go
@@ -1,6 +1,6 @@
 // Package acme contains all objects related the ACME endpoints.
 // https://tools.ietf.org/html/draft-ietf-acme-acme-16
-package acme
+package acme // import "github.com/xenolf/lego/acme"
 
 import (
 	"encoding/json"
diff --git a/acme/errors.go b/acme/errors.go
index 1658fe8d..ba941b06 100644
--- a/acme/errors.go
+++ b/acme/errors.go
@@ -1,4 +1,4 @@
-package acme
+package acme // import "github.com/xenolf/lego/acme"
 
 import (
 	"fmt"
diff --git a/certcrypto/crypto.go b/certcrypto/crypto.go
index c9d0c109..5960dff9 100644
--- a/certcrypto/crypto.go
+++ b/certcrypto/crypto.go
@@ -1,4 +1,4 @@
-package certcrypto
+package certcrypto // import "github.com/xenolf/lego/certcrypto"
 
 import (
 	"crypto"
diff --git a/certcrypto/crypto_test.go b/certcrypto/crypto_test.go
index 27e3b412..4b7d4f39 100644
--- a/certcrypto/crypto_test.go
+++ b/certcrypto/crypto_test.go
@@ -1,4 +1,4 @@
-package certcrypto
+package certcrypto // import "github.com/xenolf/lego/certcrypto"
 
 import (
 	"bytes"
diff --git a/certificate/authorization.go b/certificate/authorization.go
index c35de109..4aa169fa 100644
--- a/certificate/authorization.go
+++ b/certificate/authorization.go
@@ -1,4 +1,4 @@
-package certificate
+package certificate // import "github.com/xenolf/lego/certificate"
 
 import (
 	"time"
diff --git a/certificate/certificates.go b/certificate/certificates.go
index 10003ac0..7515cf01 100644
--- a/certificate/certificates.go
+++ b/certificate/certificates.go
@@ -1,4 +1,4 @@
-package certificate
+package certificate // import "github.com/xenolf/lego/certificate"
 
 import (
 	"bytes"
diff --git a/certificate/certificates_test.go b/certificate/certificates_test.go
index 61811fa7..7451e485 100644
--- a/certificate/certificates_test.go
+++ b/certificate/certificates_test.go
@@ -1,4 +1,4 @@
-package certificate
+package certificate // import "github.com/xenolf/lego/certificate"
 
 import (
 	"crypto/rand"
diff --git a/certificate/errors.go b/certificate/errors.go
index 0fec7c16..2b2e72ad 100644
--- a/certificate/errors.go
+++ b/certificate/errors.go
@@ -1,4 +1,4 @@
-package certificate
+package certificate // import "github.com/xenolf/lego/certificate"
 
 import (
 	"bytes"
diff --git a/challenge/challenges.go b/challenge/challenges.go
index e8c862ea..358384e6 100644
--- a/challenge/challenges.go
+++ b/challenge/challenges.go
@@ -1,4 +1,4 @@
-package challenge
+package challenge // import "github.com/xenolf/lego/challenge"
 
 import (
 	"fmt"
diff --git a/challenge/dns01/cname.go b/challenge/dns01/cname.go
index 619c8476..cc4f0d84 100644
--- a/challenge/dns01/cname.go
+++ b/challenge/dns01/cname.go
@@ -1,4 +1,4 @@
-package dns01
+package dns01 // import "github.com/xenolf/lego/challenge/dns01"
 
 import "github.com/miekg/dns"
 
diff --git a/challenge/dns01/dns_challenge.go b/challenge/dns01/dns_challenge.go
index ace01378..f9f08224 100644
--- a/challenge/dns01/dns_challenge.go
+++ b/challenge/dns01/dns_challenge.go
@@ -1,4 +1,4 @@
-package dns01
+package dns01 // import "github.com/xenolf/lego/challenge/dns01"
 
 import (
 	"crypto/sha256"
diff --git a/challenge/dns01/dns_challenge_manual.go b/challenge/dns01/dns_challenge_manual.go
index 490108dd..dcdca945 100644
--- a/challenge/dns01/dns_challenge_manual.go
+++ b/challenge/dns01/dns_challenge_manual.go
@@ -1,4 +1,4 @@
-package dns01
+package dns01 // import "github.com/xenolf/lego/challenge/dns01"
 
 import (
 	"bufio"
diff --git a/challenge/dns01/dns_challenge_manual_test.go b/challenge/dns01/dns_challenge_manual_test.go
index 8802c35a..24c6f194 100644
--- a/challenge/dns01/dns_challenge_manual_test.go
+++ b/challenge/dns01/dns_challenge_manual_test.go
@@ -1,4 +1,4 @@
-package dns01
+package dns01 // import "github.com/xenolf/lego/challenge/dns01"
 
 import (
 	"io"
diff --git a/challenge/dns01/dns_challenge_test.go b/challenge/dns01/dns_challenge_test.go
index 172c0146..30fb8697 100644
--- a/challenge/dns01/dns_challenge_test.go
+++ b/challenge/dns01/dns_challenge_test.go
@@ -1,4 +1,4 @@
-package dns01
+package dns01 // import "github.com/xenolf/lego/challenge/dns01"
 
 import (
 	"crypto/rand"
diff --git a/challenge/dns01/fqdn.go b/challenge/dns01/fqdn.go
index c238c8cf..36d5c809 100644
--- a/challenge/dns01/fqdn.go
+++ b/challenge/dns01/fqdn.go
@@ -1,4 +1,4 @@
-package dns01
+package dns01 // import "github.com/xenolf/lego/challenge/dns01"
 
 // ToFqdn converts the name into a fqdn appending a trailing dot.
 func ToFqdn(name string) string {
diff --git a/challenge/dns01/fqdn_test.go b/challenge/dns01/fqdn_test.go
index ab7be2a4..f36d4a98 100644
--- a/challenge/dns01/fqdn_test.go
+++ b/challenge/dns01/fqdn_test.go
@@ -1,4 +1,4 @@
-package dns01
+package dns01 // import "github.com/xenolf/lego/challenge/dns01"
 
 import (
 	"testing"
diff --git a/challenge/dns01/nameserver.go b/challenge/dns01/nameserver.go
index 03f1a8d1..af66dec6 100644
--- a/challenge/dns01/nameserver.go
+++ b/challenge/dns01/nameserver.go
@@ -1,4 +1,4 @@
-package dns01
+package dns01 // import "github.com/xenolf/lego/challenge/dns01"
 
 import (
 	"fmt"
diff --git a/challenge/dns01/nameserver_test.go b/challenge/dns01/nameserver_test.go
index 37b73c78..65cce858 100644
--- a/challenge/dns01/nameserver_test.go
+++ b/challenge/dns01/nameserver_test.go
@@ -1,4 +1,4 @@
-package dns01
+package dns01 // import "github.com/xenolf/lego/challenge/dns01"
 
 import (
 	"sort"
diff --git a/challenge/dns01/precheck.go b/challenge/dns01/precheck.go
index 00e09854..d0b50799 100644
--- a/challenge/dns01/precheck.go
+++ b/challenge/dns01/precheck.go
@@ -1,4 +1,4 @@
-package dns01
+package dns01 // import "github.com/xenolf/lego/challenge/dns01"
 
 import (
 	"errors"
diff --git a/challenge/dns01/precheck_test.go b/challenge/dns01/precheck_test.go
index 05e20497..441d7b81 100644
--- a/challenge/dns01/precheck_test.go
+++ b/challenge/dns01/precheck_test.go
@@ -1,4 +1,4 @@
-package dns01
+package dns01 // import "github.com/xenolf/lego/challenge/dns01"
 
 import (
 	"testing"
diff --git a/challenge/http01/http_challenge.go b/challenge/http01/http_challenge.go
index 861bdbed..e7f93eee 100644
--- a/challenge/http01/http_challenge.go
+++ b/challenge/http01/http_challenge.go
@@ -1,4 +1,4 @@
-package http01
+package http01 // import "github.com/xenolf/lego/challenge/http01"
 
 import (
 	"fmt"
diff --git a/challenge/http01/http_challenge_server.go b/challenge/http01/http_challenge_server.go
index aa463bb4..29614aba 100644
--- a/challenge/http01/http_challenge_server.go
+++ b/challenge/http01/http_challenge_server.go
@@ -1,4 +1,4 @@
-package http01
+package http01 // import "github.com/xenolf/lego/challenge/http01"
 
 import (
 	"fmt"
diff --git a/challenge/http01/http_challenge_test.go b/challenge/http01/http_challenge_test.go
index a250369e..ea131203 100644
--- a/challenge/http01/http_challenge_test.go
+++ b/challenge/http01/http_challenge_test.go
@@ -1,4 +1,4 @@
-package http01
+package http01 // import "github.com/xenolf/lego/challenge/http01"
 
 import (
 	"crypto/rand"
diff --git a/challenge/provider.go b/challenge/provider.go
index d7cc213f..04edfd7a 100644
--- a/challenge/provider.go
+++ b/challenge/provider.go
@@ -1,4 +1,4 @@
-package challenge
+package challenge // import "github.com/xenolf/lego/challenge"
 
 import "time"
 
diff --git a/challenge/resolver/errors.go b/challenge/resolver/errors.go
index 9d609143..8c018404 100644
--- a/challenge/resolver/errors.go
+++ b/challenge/resolver/errors.go
@@ -1,4 +1,4 @@
-package resolver
+package resolver // import "github.com/xenolf/lego/challenge/resolver"
 
 import (
 	"bytes"
diff --git a/challenge/resolver/prober.go b/challenge/resolver/prober.go
index 2f477f9c..185f9284 100644
--- a/challenge/resolver/prober.go
+++ b/challenge/resolver/prober.go
@@ -1,4 +1,4 @@
-package resolver
+package resolver // import "github.com/xenolf/lego/challenge/resolver"
 
 import (
 	"fmt"
diff --git a/challenge/resolver/prober_mock_test.go b/challenge/resolver/prober_mock_test.go
index a4820377..5e51f843 100644
--- a/challenge/resolver/prober_mock_test.go
+++ b/challenge/resolver/prober_mock_test.go
@@ -1,4 +1,4 @@
-package resolver
+package resolver // import "github.com/xenolf/lego/challenge/resolver"
 
 import (
 	"time"
diff --git a/challenge/resolver/prober_test.go b/challenge/resolver/prober_test.go
index c2a8ac20..e4a71c6b 100644
--- a/challenge/resolver/prober_test.go
+++ b/challenge/resolver/prober_test.go
@@ -1,4 +1,4 @@
-package resolver
+package resolver // import "github.com/xenolf/lego/challenge/resolver"
 
 import (
 	"errors"
diff --git a/challenge/resolver/solver_manager.go b/challenge/resolver/solver_manager.go
index 840e19d8..385a42b4 100644
--- a/challenge/resolver/solver_manager.go
+++ b/challenge/resolver/solver_manager.go
@@ -1,4 +1,4 @@
-package resolver
+package resolver // import "github.com/xenolf/lego/challenge/resolver"
 
 import (
 	"context"
diff --git a/challenge/resolver/solver_manager_test.go b/challenge/resolver/solver_manager_test.go
index b349c781..011c45ab 100644
--- a/challenge/resolver/solver_manager_test.go
+++ b/challenge/resolver/solver_manager_test.go
@@ -1,4 +1,4 @@
-package resolver
+package resolver // import "github.com/xenolf/lego/challenge/resolver"
 
 import (
 	"crypto/rand"
diff --git a/challenge/tlsalpn01/tls_alpn_challenge.go b/challenge/tlsalpn01/tls_alpn_challenge.go
index fa03ffdb..ae9a3a28 100644
--- a/challenge/tlsalpn01/tls_alpn_challenge.go
+++ b/challenge/tlsalpn01/tls_alpn_challenge.go
@@ -1,4 +1,4 @@
-package tlsalpn01
+package tlsalpn01 // import "github.com/xenolf/lego/challenge/tlsalpn01"
 
 import (
 	"crypto/rsa"
diff --git a/challenge/tlsalpn01/tls_alpn_challenge_server.go b/challenge/tlsalpn01/tls_alpn_challenge_server.go
index 1f7480c2..814cdc65 100644
--- a/challenge/tlsalpn01/tls_alpn_challenge_server.go
+++ b/challenge/tlsalpn01/tls_alpn_challenge_server.go
@@ -1,4 +1,4 @@
-package tlsalpn01
+package tlsalpn01 // import "github.com/xenolf/lego/challenge/tlsalpn01"
 
 import (
 	"crypto/tls"
diff --git a/challenge/tlsalpn01/tls_alpn_challenge_test.go b/challenge/tlsalpn01/tls_alpn_challenge_test.go
index a3e4f14a..0d8c44bd 100644
--- a/challenge/tlsalpn01/tls_alpn_challenge_test.go
+++ b/challenge/tlsalpn01/tls_alpn_challenge_test.go
@@ -1,4 +1,4 @@
-package tlsalpn01
+package tlsalpn01 // import "github.com/xenolf/lego/challenge/tlsalpn01"
 
 import (
 	"crypto/rand"
diff --git a/cmd/account.go b/cmd/account.go
index 5cc43f52..789d0206 100644
--- a/cmd/account.go
+++ b/cmd/account.go
@@ -1,4 +1,4 @@
-package cmd
+package cmd // import "github.com/xenolf/lego/cmd"
 
 import (
 	"crypto"
diff --git a/cmd/accounts_storage.go b/cmd/accounts_storage.go
index 1469cad1..17534e13 100644
--- a/cmd/accounts_storage.go
+++ b/cmd/accounts_storage.go
@@ -1,4 +1,4 @@
-package cmd
+package cmd // import "github.com/xenolf/lego/cmd"
 
 import (
 	"crypto"
diff --git a/cmd/certs_storage.go b/cmd/certs_storage.go
index 533794b0..21edbde1 100644
--- a/cmd/certs_storage.go
+++ b/cmd/certs_storage.go
@@ -1,4 +1,4 @@
-package cmd
+package cmd // import "github.com/xenolf/lego/cmd"
 
 import (
 	"bytes"
diff --git a/cmd/cmd.go b/cmd/cmd.go
index 2c63a5af..71921c6c 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -1,4 +1,4 @@
-package cmd
+package cmd // import "github.com/xenolf/lego/cmd"
 
 import "github.com/urfave/cli"
 
diff --git a/cmd/cmd_before.go b/cmd/cmd_before.go
index 87e0d2b0..55246678 100644
--- a/cmd/cmd_before.go
+++ b/cmd/cmd_before.go
@@ -1,4 +1,4 @@
-package cmd
+package cmd // import "github.com/xenolf/lego/cmd"
 
 import (
 	"github.com/urfave/cli"
diff --git a/cmd/cmd_dnshelp.go b/cmd/cmd_dnshelp.go
index 8852833f..f4ce1502 100644
--- a/cmd/cmd_dnshelp.go
+++ b/cmd/cmd_dnshelp.go
@@ -1,4 +1,4 @@
-package cmd
+package cmd // import "github.com/xenolf/lego/cmd"
 
 import (
 	"fmt"
@@ -37,7 +37,7 @@ func dnsHelp(ctx *cli.Context) error {
 		fmt.Fprintln(w, "All DNS codes:")
 		fmt.Fprintf(w, "\t%s\n", allDNSCodes())
 		fmt.Fprintln(w)
-		fmt.Fprintln(w, "More information: https://xenolf.github.io/lego/dns")
+		fmt.Fprintln(w, "More information: https://go-acme.github.io/lego/dns")
 
 		return w.Flush()
 	}
diff --git a/cmd/cmd_list.go b/cmd/cmd_list.go
index 69228ee4..db40641f 100644
--- a/cmd/cmd_list.go
+++ b/cmd/cmd_list.go
@@ -1,4 +1,4 @@
-package cmd
+package cmd // import "github.com/xenolf/lego/cmd"
 
 import (
 	"encoding/json"
diff --git a/cmd/cmd_renew.go b/cmd/cmd_renew.go
index 35a8273c..9bf666e4 100644
--- a/cmd/cmd_renew.go
+++ b/cmd/cmd_renew.go
@@ -1,4 +1,4 @@
-package cmd
+package cmd // import "github.com/xenolf/lego/cmd"
 
 import (
 	"crypto"
@@ -53,6 +53,7 @@ func createRenew() cli.Command {
 
 func renew(ctx *cli.Context) error {
 	account, client := setup(ctx, NewAccountsStorage(ctx))
+	setupChallenges(ctx, client)
 
 	if account.Registration == nil {
 		log.Fatalf("Account %s is not registered. Use 'run' to register a new account.\n", account.Email)
diff --git a/cmd/cmd_renew_test.go b/cmd/cmd_renew_test.go
index 69ddcc92..f4a4a838 100644
--- a/cmd/cmd_renew_test.go
+++ b/cmd/cmd_renew_test.go
@@ -1,4 +1,4 @@
-package cmd
+package cmd // import "github.com/xenolf/lego/cmd"
 
 import (
 	"testing"
diff --git a/cmd/cmd_revoke.go b/cmd/cmd_revoke.go
index da446c04..7d765389 100644
--- a/cmd/cmd_revoke.go
+++ b/cmd/cmd_revoke.go
@@ -1,4 +1,4 @@
-package cmd
+package cmd // import "github.com/xenolf/lego/cmd"
 
 import (
 	"github.com/urfave/cli"
diff --git a/cmd/cmd_run.go b/cmd/cmd_run.go
index a47d5097..06b5b34e 100644
--- a/cmd/cmd_run.go
+++ b/cmd/cmd_run.go
@@ -1,4 +1,4 @@
-package cmd
+package cmd // import "github.com/xenolf/lego/cmd"
 
 import (
 	"bufio"
@@ -47,6 +47,7 @@ func run(ctx *cli.Context) error {
 	accountsStorage := NewAccountsStorage(ctx)
 
 	account, client := setup(ctx, accountsStorage)
+	setupChallenges(ctx, client)
 
 	if account.Registration == nil {
 		reg, err := register(ctx, client)
diff --git a/cmd/flags.go b/cmd/flags.go
index 84d3d5b1..ee7915b4 100644
--- a/cmd/flags.go
+++ b/cmd/flags.go
@@ -1,4 +1,4 @@
-package cmd
+package cmd // import "github.com/xenolf/lego/cmd"
 
 import (
 	"github.com/urfave/cli"
diff --git a/cmd/setup.go b/cmd/setup.go
index 976b3cbb..d1950c50 100644
--- a/cmd/setup.go
+++ b/cmd/setup.go
@@ -1,4 +1,4 @@
-package cmd
+package cmd // import "github.com/xenolf/lego/cmd"
 
 import (
 	"crypto/x509"
@@ -53,8 +53,6 @@ func newClient(ctx *cli.Context, acc registration.User, keyType certcrypto.KeyTy
 		log.Fatalf("Could not create client: %v", err)
 	}
 
-	setupChallenges(ctx, client)
-
 	if client.GetExternalAccountRequired() && !ctx.GlobalIsSet("eab") {
 		log.Fatal("Server requires External Account Binding. Use --eab with --kid and --hmac.")
 	}
diff --git a/cmd/setup_challenges.go b/cmd/setup_challenges.go
index 57cba52c..4b6336e7 100644
--- a/cmd/setup_challenges.go
+++ b/cmd/setup_challenges.go
@@ -1,4 +1,4 @@
-package cmd
+package cmd // import "github.com/xenolf/lego/cmd"
 
 import (
 	"net"
diff --git a/e2e/loader/loader.go b/e2e/loader/loader.go
index ec95ffa0..857df548 100644
--- a/e2e/loader/loader.go
+++ b/e2e/loader/loader.go
@@ -1,4 +1,4 @@
-package loader
+package loader // import "github.com/xenolf/lego/e2e/loader"
 
 import (
 	"bytes"
diff --git a/lego/client.go b/lego/client.go
index 1f7b5c8d..8d326424 100644
--- a/lego/client.go
+++ b/lego/client.go
@@ -1,4 +1,4 @@
-package lego
+package lego // import "github.com/xenolf/lego/lego"
 
 import (
 	"errors"
diff --git a/lego/client_config.go b/lego/client_config.go
index 4807fcfe..71a4ea05 100644
--- a/lego/client_config.go
+++ b/lego/client_config.go
@@ -1,4 +1,4 @@
-package lego
+package lego // import "github.com/xenolf/lego/lego"
 
 import (
 	"crypto/tls"
diff --git a/lego/client_test.go b/lego/client_test.go
index f9be9cff..e07c2c6c 100644
--- a/lego/client_test.go
+++ b/lego/client_test.go
@@ -1,4 +1,4 @@
-package lego
+package lego // import "github.com/xenolf/lego/lego"
 
 import (
 	"crypto"
diff --git a/log/logger.go b/log/logger.go
index 22ec98f0..cb946c2c 100644
--- a/log/logger.go
+++ b/log/logger.go
@@ -1,4 +1,4 @@
-package log
+package log // import "github.com/xenolf/lego/log"
 
 import (
 	"log"
diff --git a/platform/config/env/env.go b/platform/config/env/env.go
index aaae6eae..07aafd7c 100644
--- a/platform/config/env/env.go
+++ b/platform/config/env/env.go
@@ -1,4 +1,4 @@
-package env
+package env // import "github.com/xenolf/lego/platform/config/env"
 
 import (
 	"errors"
diff --git a/platform/config/env/env_test.go b/platform/config/env/env_test.go
index 3bd5c403..a2ce18a7 100644
--- a/platform/config/env/env_test.go
+++ b/platform/config/env/env_test.go
@@ -1,4 +1,4 @@
-package env
+package env // import "github.com/xenolf/lego/platform/config/env"
 
 import (
 	"io/ioutil"
diff --git a/platform/tester/api.go b/platform/tester/api.go
index b5cbf122..059e432d 100644
--- a/platform/tester/api.go
+++ b/platform/tester/api.go
@@ -1,4 +1,4 @@
-package tester
+package tester // import "github.com/xenolf/lego/platform/tester"
 
 import (
 	"encoding/json"
diff --git a/platform/tester/env.go b/platform/tester/env.go
index 943842db..c6714c72 100644
--- a/platform/tester/env.go
+++ b/platform/tester/env.go
@@ -1,4 +1,4 @@
-package tester
+package tester // import "github.com/xenolf/lego/platform/tester"
 
 import (
 	"fmt"
diff --git a/platform/tester/env_test.go b/platform/tester/env_test.go
index 3e6495e8..fe296f94 100644
--- a/platform/tester/env_test.go
+++ b/platform/tester/env_test.go
@@ -1,4 +1,4 @@
-package tester_test
+package tester_test // import "github.com/xenolf/lego/platform/tester"
 
 import (
 	"os"
diff --git a/platform/wait/wait.go b/platform/wait/wait.go
index 511e1f28..bc283097 100644
--- a/platform/wait/wait.go
+++ b/platform/wait/wait.go
@@ -1,4 +1,4 @@
-package wait
+package wait // import "github.com/xenolf/lego/platform/wait"
 
 import (
 	"fmt"
diff --git a/platform/wait/wait_test.go b/platform/wait/wait_test.go
index fc6673c1..2e04a101 100644
--- a/platform/wait/wait_test.go
+++ b/platform/wait/wait_test.go
@@ -1,4 +1,4 @@
-package wait
+package wait // import "github.com/xenolf/lego/platform/wait"
 
 import (
 	"testing"
diff --git a/providers/dns/acmedns/acmedns.go b/providers/dns/acmedns/acmedns.go
index e642420a..86f5ce27 100644
--- a/providers/dns/acmedns/acmedns.go
+++ b/providers/dns/acmedns/acmedns.go
@@ -1,6 +1,6 @@
 // Package acmedns implements a DNS provider for solving DNS-01 challenges using Joohoi's acme-dns project.
 // For more information see the ACME-DNS homepage: https://github.com/joohoi/acme-dns
-package acmedns
+package acmedns // import "github.com/xenolf/lego/providers/dns/acmedns"
 
 import (
 	"errors"
diff --git a/providers/dns/acmedns/acmedns_test.go b/providers/dns/acmedns/acmedns_test.go
index 07b554b0..23e26850 100644
--- a/providers/dns/acmedns/acmedns_test.go
+++ b/providers/dns/acmedns/acmedns_test.go
@@ -1,4 +1,4 @@
-package acmedns
+package acmedns // import "github.com/xenolf/lego/providers/dns/acmedns"
 
 import (
 	"errors"
diff --git a/providers/dns/alidns/alidns.go b/providers/dns/alidns/alidns.go
index 38efeb78..32346782 100644
--- a/providers/dns/alidns/alidns.go
+++ b/providers/dns/alidns/alidns.go
@@ -1,5 +1,5 @@
 // Package alidns implements a DNS provider for solving the DNS-01 challenge using Alibaba Cloud DNS.
-package alidns
+package alidns // import "github.com/xenolf/lego/providers/dns/alidns"
 
 import (
 	"errors"
diff --git a/providers/dns/alidns/alidns_test.go b/providers/dns/alidns/alidns_test.go
index f0cb2e30..269c6d36 100644
--- a/providers/dns/alidns/alidns_test.go
+++ b/providers/dns/alidns/alidns_test.go
@@ -1,4 +1,4 @@
-package alidns
+package alidns // import "github.com/xenolf/lego/providers/dns/alidns"
 
 import (
 	"testing"
diff --git a/providers/dns/auroradns/auroradns.go b/providers/dns/auroradns/auroradns.go
index d61e30ba..52666ec3 100644
--- a/providers/dns/auroradns/auroradns.go
+++ b/providers/dns/auroradns/auroradns.go
@@ -1,5 +1,5 @@
 // Package auroradns implements a DNS provider for solving the DNS-01 challenge using Aurora DNS.
-package auroradns
+package auroradns // import "github.com/xenolf/lego/providers/dns/auroradns"
 
 import (
 	"errors"
diff --git a/providers/dns/auroradns/auroradns_test.go b/providers/dns/auroradns/auroradns_test.go
index aa3c9817..3dd221de 100644
--- a/providers/dns/auroradns/auroradns_test.go
+++ b/providers/dns/auroradns/auroradns_test.go
@@ -1,4 +1,4 @@
-package auroradns
+package auroradns // import "github.com/xenolf/lego/providers/dns/auroradns"
 
 import (
 	"fmt"
diff --git a/providers/dns/azure/azure.go b/providers/dns/azure/azure.go
index 5d95b7cb..810ff6e4 100644
--- a/providers/dns/azure/azure.go
+++ b/providers/dns/azure/azure.go
@@ -1,6 +1,6 @@
 // Package azure implements a DNS provider for solving the DNS-01 challenge using azure DNS.
 // Azure doesn't like trailing dots on domain names, most of the acme code does.
-package azure
+package azure // import "github.com/xenolf/lego/providers/dns/azure"
 
 import (
 	"context"
diff --git a/providers/dns/azure/azure_test.go b/providers/dns/azure/azure_test.go
index b7adbe93..d5e53299 100644
--- a/providers/dns/azure/azure_test.go
+++ b/providers/dns/azure/azure_test.go
@@ -1,4 +1,4 @@
-package azure
+package azure // import "github.com/xenolf/lego/providers/dns/azure"
 
 import (
 	"net/http"
diff --git a/providers/dns/bluecat/bluecat.go b/providers/dns/bluecat/bluecat.go
index 3cee02fb..94a74a07 100644
--- a/providers/dns/bluecat/bluecat.go
+++ b/providers/dns/bluecat/bluecat.go
@@ -1,5 +1,5 @@
 // Package bluecat implements a DNS provider for solving the DNS-01 challenge using a self-hosted Bluecat Address Manager.
-package bluecat
+package bluecat // import "github.com/xenolf/lego/providers/dns/bluecat"
 
 import (
 	"encoding/json"
diff --git a/providers/dns/bluecat/bluecat_test.go b/providers/dns/bluecat/bluecat_test.go
index da46d0ea..f6b4718a 100644
--- a/providers/dns/bluecat/bluecat_test.go
+++ b/providers/dns/bluecat/bluecat_test.go
@@ -1,4 +1,4 @@
-package bluecat
+package bluecat // import "github.com/xenolf/lego/providers/dns/bluecat"
 
 import (
 	"testing"
diff --git a/providers/dns/bluecat/client.go b/providers/dns/bluecat/client.go
index d910594c..317d33f5 100644
--- a/providers/dns/bluecat/client.go
+++ b/providers/dns/bluecat/client.go
@@ -1,4 +1,4 @@
-package bluecat
+package bluecat // import "github.com/xenolf/lego/providers/dns/bluecat"
 
 import (
 	"bytes"
diff --git a/providers/dns/cloudflare/cloudflare.go b/providers/dns/cloudflare/cloudflare.go
index 97dc5356..c178c79e 100644
--- a/providers/dns/cloudflare/cloudflare.go
+++ b/providers/dns/cloudflare/cloudflare.go
@@ -1,5 +1,5 @@
 // Package cloudflare implements a DNS provider for solving the DNS-01 challenge using cloudflare DNS.
-package cloudflare
+package cloudflare // import "github.com/xenolf/lego/providers/dns/cloudflare"
 
 import (
 	"errors"
diff --git a/providers/dns/cloudflare/cloudflare_test.go b/providers/dns/cloudflare/cloudflare_test.go
index 4c7a0e66..c09f3b6a 100644
--- a/providers/dns/cloudflare/cloudflare_test.go
+++ b/providers/dns/cloudflare/cloudflare_test.go
@@ -1,4 +1,4 @@
-package cloudflare
+package cloudflare // import "github.com/xenolf/lego/providers/dns/cloudflare"
 
 import (
 	"testing"
diff --git a/providers/dns/cloudns/cloudns.go b/providers/dns/cloudns/cloudns.go
index 6b4aaaa8..5626b360 100644
--- a/providers/dns/cloudns/cloudns.go
+++ b/providers/dns/cloudns/cloudns.go
@@ -1,5 +1,5 @@
 // Package cloudns implements a DNS provider for solving the DNS-01 challenge using ClouDNS DNS.
-package cloudns
+package cloudns // import "github.com/xenolf/lego/providers/dns/cloudns"
 
 import (
 	"errors"
diff --git a/providers/dns/cloudns/cloudns_test.go b/providers/dns/cloudns/cloudns_test.go
index 0a1da286..ddceb684 100644
--- a/providers/dns/cloudns/cloudns_test.go
+++ b/providers/dns/cloudns/cloudns_test.go
@@ -1,4 +1,4 @@
-package cloudns
+package cloudns // import "github.com/xenolf/lego/providers/dns/cloudns"
 
 import (
 	"testing"
diff --git a/providers/dns/cloudns/internal/client.go b/providers/dns/cloudns/internal/client.go
index c3df3658..77ccc803 100644
--- a/providers/dns/cloudns/internal/client.go
+++ b/providers/dns/cloudns/internal/client.go
@@ -1,4 +1,4 @@
-package internal
+package internal // import "github.com/xenolf/lego/providers/dns/cloudns/internal"
 
 import (
 	"encoding/json"
diff --git a/providers/dns/cloudns/internal/client_test.go b/providers/dns/cloudns/internal/client_test.go
index 674e8a6c..51838c77 100644
--- a/providers/dns/cloudns/internal/client_test.go
+++ b/providers/dns/cloudns/internal/client_test.go
@@ -1,4 +1,4 @@
-package internal
+package internal // import "github.com/xenolf/lego/providers/dns/cloudns/internal"
 
 import (
 	"fmt"
diff --git a/providers/dns/cloudxns/cloudxns.go b/providers/dns/cloudxns/cloudxns.go
index 5fad1db4..5d22f79d 100644
--- a/providers/dns/cloudxns/cloudxns.go
+++ b/providers/dns/cloudxns/cloudxns.go
@@ -1,5 +1,5 @@
 // Package cloudxns implements a DNS provider for solving the DNS-01 challenge using CloudXNS DNS.
-package cloudxns
+package cloudxns // import "github.com/xenolf/lego/providers/dns/cloudxns"
 
 import (
 	"errors"
diff --git a/providers/dns/cloudxns/cloudxns_test.go b/providers/dns/cloudxns/cloudxns_test.go
index 16527cf1..fbd4819b 100644
--- a/providers/dns/cloudxns/cloudxns_test.go
+++ b/providers/dns/cloudxns/cloudxns_test.go
@@ -1,4 +1,4 @@
-package cloudxns
+package cloudxns // import "github.com/xenolf/lego/providers/dns/cloudxns"
 
 import (
 	"testing"
diff --git a/providers/dns/cloudxns/internal/client.go b/providers/dns/cloudxns/internal/client.go
index fd3319a0..1ea19193 100644
--- a/providers/dns/cloudxns/internal/client.go
+++ b/providers/dns/cloudxns/internal/client.go
@@ -1,4 +1,4 @@
-package internal
+package internal // import "github.com/xenolf/lego/providers/dns/cloudxns/internal"
 
 import (
 	"bytes"
diff --git a/providers/dns/cloudxns/internal/client_test.go b/providers/dns/cloudxns/internal/client_test.go
index c9d62096..5766d504 100644
--- a/providers/dns/cloudxns/internal/client_test.go
+++ b/providers/dns/cloudxns/internal/client_test.go
@@ -1,4 +1,4 @@
-package internal
+package internal // import "github.com/xenolf/lego/providers/dns/cloudxns/internal"
 
 import (
 	"encoding/json"
diff --git a/providers/dns/conoha/conoha.go b/providers/dns/conoha/conoha.go
index d2f93798..1caf47a4 100644
--- a/providers/dns/conoha/conoha.go
+++ b/providers/dns/conoha/conoha.go
@@ -1,5 +1,5 @@
 // Package conoha implements a DNS provider for solving the DNS-01 challenge using ConoHa DNS.
-package conoha
+package conoha // import "github.com/xenolf/lego/providers/dns/conoha"
 
 import (
 	"errors"
diff --git a/providers/dns/conoha/conoha_test.go b/providers/dns/conoha/conoha_test.go
index bbc0dea9..5cceca02 100644
--- a/providers/dns/conoha/conoha_test.go
+++ b/providers/dns/conoha/conoha_test.go
@@ -1,4 +1,4 @@
-package conoha
+package conoha // import "github.com/xenolf/lego/providers/dns/conoha"
 
 import (
 	"testing"
diff --git a/providers/dns/conoha/internal/client.go b/providers/dns/conoha/internal/client.go
index 3136a24d..723127f4 100644
--- a/providers/dns/conoha/internal/client.go
+++ b/providers/dns/conoha/internal/client.go
@@ -1,4 +1,4 @@
-package internal
+package internal // import "github.com/xenolf/lego/providers/dns/conoha/internal"
 
 import (
 	"bytes"
diff --git a/providers/dns/conoha/internal/client_test.go b/providers/dns/conoha/internal/client_test.go
index 75f2bdb4..a27142d4 100644
--- a/providers/dns/conoha/internal/client_test.go
+++ b/providers/dns/conoha/internal/client_test.go
@@ -1,4 +1,4 @@
-package internal
+package internal // import "github.com/xenolf/lego/providers/dns/conoha/internal"
 
 import (
 	"fmt"
diff --git a/providers/dns/designate/designate.go b/providers/dns/designate/designate.go
index 22f97017..e9c76247 100644
--- a/providers/dns/designate/designate.go
+++ b/providers/dns/designate/designate.go
@@ -1,5 +1,5 @@
 // Package designate implements a DNS provider for solving the DNS-01 challenge using the Designate DNSaaS for Openstack.
-package designate
+package designate // import "github.com/xenolf/lego/providers/dns/designate"
 
 import (
 	"errors"
diff --git a/providers/dns/designate/designate_test.go b/providers/dns/designate/designate_test.go
index 8b365bc9..5ff5000d 100644
--- a/providers/dns/designate/designate_test.go
+++ b/providers/dns/designate/designate_test.go
@@ -1,4 +1,4 @@
-package designate
+package designate // import "github.com/xenolf/lego/providers/dns/designate"
 
 import (
 	"net/http"
diff --git a/providers/dns/dns_providers.go b/providers/dns/dns_providers.go
index 2846ee58..9f3272b5 100644
--- a/providers/dns/dns_providers.go
+++ b/providers/dns/dns_providers.go
@@ -1,4 +1,4 @@
-package dns
+package dns // import "github.com/xenolf/lego/providers/dns"
 
 import (
 	"fmt"
diff --git a/providers/dns/dns_providers_test.go b/providers/dns/dns_providers_test.go
index 230aab0e..cea78cc9 100644
--- a/providers/dns/dns_providers_test.go
+++ b/providers/dns/dns_providers_test.go
@@ -1,4 +1,4 @@
-package dns
+package dns // import "github.com/xenolf/lego/providers/dns"
 
 import (
 	"testing"
diff --git a/providers/dns/dnsimple/dnsimple.go b/providers/dns/dnsimple/dnsimple.go
index 3709b84f..b037c040 100644
--- a/providers/dns/dnsimple/dnsimple.go
+++ b/providers/dns/dnsimple/dnsimple.go
@@ -1,5 +1,5 @@
 // Package dnsimple implements a DNS provider for solving the DNS-01 challenge using dnsimple DNS.
-package dnsimple
+package dnsimple // import "github.com/xenolf/lego/providers/dns/dnsimple"
 
 import (
 	"context"
diff --git a/providers/dns/dnsimple/dnsimple_test.go b/providers/dns/dnsimple/dnsimple_test.go
index d21a8dff..70f4acf6 100644
--- a/providers/dns/dnsimple/dnsimple_test.go
+++ b/providers/dns/dnsimple/dnsimple_test.go
@@ -1,4 +1,4 @@
-package dnsimple
+package dnsimple // import "github.com/xenolf/lego/providers/dns/dnsimple"
 
 import (
 	"os"
diff --git a/providers/dns/dnsmadeeasy/internal/client.go b/providers/dns/dnsmadeeasy/internal/client.go
index 748d385d..4c149629 100644
--- a/providers/dns/dnsmadeeasy/internal/client.go
+++ b/providers/dns/dnsmadeeasy/internal/client.go
@@ -1,4 +1,4 @@
-package internal
+package internal // import "github.com/xenolf/lego/providers/dns/dnsmadeeasy/internal"
 
 import (
 	"bytes"
diff --git a/providers/dns/dnspod/dnspod.go b/providers/dns/dnspod/dnspod.go
index 06cb566f..d528ec11 100644
--- a/providers/dns/dnspod/dnspod.go
+++ b/providers/dns/dnspod/dnspod.go
@@ -1,5 +1,5 @@
 // Package dnspod implements a DNS provider for solving the DNS-01 challenge using dnspod DNS.
-package dnspod
+package dnspod // import "github.com/xenolf/lego/providers/dns/dnspod"
 
 import (
 	"errors"
diff --git a/providers/dns/dnspod/dnspod_test.go b/providers/dns/dnspod/dnspod_test.go
index 5d235aaf..2ec61614 100644
--- a/providers/dns/dnspod/dnspod_test.go
+++ b/providers/dns/dnspod/dnspod_test.go
@@ -1,4 +1,4 @@
-package dnspod
+package dnspod // import "github.com/xenolf/lego/providers/dns/dnspod"
 
 import (
 	"testing"
diff --git a/providers/dns/dreamhost/client_test.go b/providers/dns/dreamhost/client_test.go
index c8d195bd..1b94839f 100644
--- a/providers/dns/dreamhost/client_test.go
+++ b/providers/dns/dreamhost/client_test.go
@@ -1,4 +1,4 @@
-package dreamhost
+package dreamhost // import "github.com/xenolf/lego/providers/dns/dreamhost"
 
 import (
 	"testing"
diff --git a/providers/dns/dyn/client.go b/providers/dns/dyn/client.go
index f7e6cee8..2c475c57 100644
--- a/providers/dns/dyn/client.go
+++ b/providers/dns/dyn/client.go
@@ -1,4 +1,4 @@
-package dyn
+package dyn // import "github.com/xenolf/lego/providers/dns/dyn"
 
 import (
 	"bytes"
diff --git a/providers/dns/dyn/dyn.go b/providers/dns/dyn/dyn.go
index 40fdc19f..9f713bc7 100644
--- a/providers/dns/dyn/dyn.go
+++ b/providers/dns/dyn/dyn.go
@@ -1,5 +1,5 @@
 // Package dyn implements a DNS provider for solving the DNS-01 challenge using Dyn Managed DNS.
-package dyn
+package dyn // import "github.com/xenolf/lego/providers/dns/dyn"
 
 import (
 	"errors"
diff --git a/providers/dns/dyn/dyn_test.go b/providers/dns/dyn/dyn_test.go
index eebf0fd4..7d0bc7a5 100644
--- a/providers/dns/dyn/dyn_test.go
+++ b/providers/dns/dyn/dyn_test.go
@@ -1,4 +1,4 @@
-package dyn
+package dyn // import "github.com/xenolf/lego/providers/dns/dyn"
 
 import (
 	"testing"
diff --git a/providers/dns/exec/exec.go b/providers/dns/exec/exec.go
index dc0467e1..f35b0149 100644
--- a/providers/dns/exec/exec.go
+++ b/providers/dns/exec/exec.go
@@ -1,5 +1,5 @@
 // Package exec implements a DNS provider which runs a program for adding/removing the DNS record.
-package exec
+package exec // import "github.com/xenolf/lego/providers/dns/exec"
 
 import (
 	"errors"
diff --git a/providers/dns/exec/exec_test.go b/providers/dns/exec/exec_test.go
index 56e4a818..410dd7a8 100644
--- a/providers/dns/exec/exec_test.go
+++ b/providers/dns/exec/exec_test.go
@@ -1,4 +1,4 @@
-package exec
+package exec // import "github.com/xenolf/lego/providers/dns/exec"
 
 import (
 	"fmt"
diff --git a/providers/dns/exec/log_mock_test.go b/providers/dns/exec/log_mock_test.go
index 47935cc5..6a086d69 100644
--- a/providers/dns/exec/log_mock_test.go
+++ b/providers/dns/exec/log_mock_test.go
@@ -1,4 +1,4 @@
-package exec
+package exec // import "github.com/xenolf/lego/providers/dns/exec"
 
 import "github.com/stretchr/testify/mock"
 
diff --git a/providers/dns/exoscale/exoscale.go b/providers/dns/exoscale/exoscale.go
index 1a794716..d4c92a14 100644
--- a/providers/dns/exoscale/exoscale.go
+++ b/providers/dns/exoscale/exoscale.go
@@ -1,5 +1,5 @@
 // Package exoscale implements a DNS provider for solving the DNS-01 challenge using exoscale DNS.
-package exoscale
+package exoscale // import "github.com/xenolf/lego/providers/dns/exoscale"
 
 import (
 	"context"
diff --git a/providers/dns/exoscale/exoscale_test.go b/providers/dns/exoscale/exoscale_test.go
index 6335a516..7cffe628 100644
--- a/providers/dns/exoscale/exoscale_test.go
+++ b/providers/dns/exoscale/exoscale_test.go
@@ -1,4 +1,4 @@
-package exoscale
+package exoscale // import "github.com/xenolf/lego/providers/dns/exoscale"
 
 import (
 	"testing"
diff --git a/providers/dns/gandi/client.go b/providers/dns/gandi/client.go
index 901a7894..ed9ad45b 100644
--- a/providers/dns/gandi/client.go
+++ b/providers/dns/gandi/client.go
@@ -1,4 +1,4 @@
-package gandi
+package gandi // import "github.com/xenolf/lego/providers/dns/gandi"
 
 import (
 	"bytes"
diff --git a/providers/dns/gandi/gandi.go b/providers/dns/gandi/gandi.go
index 1a486ecf..3f647c6e 100644
--- a/providers/dns/gandi/gandi.go
+++ b/providers/dns/gandi/gandi.go
@@ -1,5 +1,5 @@
 // Package gandi implements a DNS provider for solving the DNS-01 challenge using Gandi DNS.
-package gandi
+package gandi // import "github.com/xenolf/lego/providers/dns/gandi"
 
 import (
 	"errors"
diff --git a/providers/dns/gandi/gandi_mock_test.go b/providers/dns/gandi/gandi_mock_test.go
index 66c63fa3..37ac6613 100644
--- a/providers/dns/gandi/gandi_mock_test.go
+++ b/providers/dns/gandi/gandi_mock_test.go
@@ -1,4 +1,4 @@
-package gandi
+package gandi // import "github.com/xenolf/lego/providers/dns/gandi"
 
 // CleanUp Request->Response 1 (setZone)
 const cleanup1RequestMock = `<?xml version="1.0"?>
diff --git a/providers/dns/gandi/gandi_test.go b/providers/dns/gandi/gandi_test.go
index 4e76c4f9..e919c44d 100644
--- a/providers/dns/gandi/gandi_test.go
+++ b/providers/dns/gandi/gandi_test.go
@@ -1,4 +1,4 @@
-package gandi
+package gandi // import "github.com/xenolf/lego/providers/dns/gandi"
 
 import (
 	"io"
diff --git a/providers/dns/gcloud/googlecloud_test.go b/providers/dns/gcloud/googlecloud_test.go
index 8455d516..17f40cf6 100644
--- a/providers/dns/gcloud/googlecloud_test.go
+++ b/providers/dns/gcloud/googlecloud_test.go
@@ -1,4 +1,4 @@
-package gcloud
+package gcloud // import "github.com/xenolf/lego/providers/dns/gcloud"
 
 import (
 	"encoding/json"
diff --git a/providers/dns/godaddy/client.go b/providers/dns/godaddy/client.go
index 212b8e69..2f660e96 100644
--- a/providers/dns/godaddy/client.go
+++ b/providers/dns/godaddy/client.go
@@ -1,4 +1,4 @@
-package godaddy
+package godaddy // import "github.com/xenolf/lego/providers/dns/godaddy"
 
 import (
 	"bytes"
diff --git a/providers/dns/godaddy/godaddy.go b/providers/dns/godaddy/godaddy.go
index dd054ab5..419fb8e5 100644
--- a/providers/dns/godaddy/godaddy.go
+++ b/providers/dns/godaddy/godaddy.go
@@ -1,5 +1,5 @@
 // Package godaddy implements a DNS provider for solving the DNS-01 challenge using godaddy DNS.
-package godaddy
+package godaddy // import "github.com/xenolf/lego/providers/dns/godaddy"
 
 import (
 	"errors"
diff --git a/providers/dns/godaddy/godaddy_test.go b/providers/dns/godaddy/godaddy_test.go
index 5f8f7e45..be1c7a73 100644
--- a/providers/dns/godaddy/godaddy_test.go
+++ b/providers/dns/godaddy/godaddy_test.go
@@ -1,4 +1,4 @@
-package godaddy
+package godaddy // import "github.com/xenolf/lego/providers/dns/godaddy"
 
 import (
 	"testing"
diff --git a/providers/dns/hostingde/hostingde_test.go b/providers/dns/hostingde/hostingde_test.go
index 5be0d535..1a963bf4 100644
--- a/providers/dns/hostingde/hostingde_test.go
+++ b/providers/dns/hostingde/hostingde_test.go
@@ -1,4 +1,4 @@
-package hostingde
+package hostingde // import "github.com/xenolf/lego/providers/dns/hostingde"
 
 import (
 	"testing"
diff --git a/providers/dns/iij/iij.go b/providers/dns/iij/iij.go
index 9372a9c7..fdcacc37 100644
--- a/providers/dns/iij/iij.go
+++ b/providers/dns/iij/iij.go
@@ -1,5 +1,5 @@
 // Package iij implements a DNS provider for solving the DNS-01 challenge using IIJ DNS.
-package iij
+package iij // import "github.com/xenolf/lego/providers/dns/iij"
 
 import (
 	"fmt"
diff --git a/providers/dns/iij/iij_test.go b/providers/dns/iij/iij_test.go
index 07d730bb..4b4d113e 100644
--- a/providers/dns/iij/iij_test.go
+++ b/providers/dns/iij/iij_test.go
@@ -1,4 +1,4 @@
-package iij
+package iij // import "github.com/xenolf/lego/providers/dns/iij"
 
 import (
 	"testing"
diff --git a/providers/dns/inwx/inwx.go b/providers/dns/inwx/inwx.go
index be08a015..735d982a 100644
--- a/providers/dns/inwx/inwx.go
+++ b/providers/dns/inwx/inwx.go
@@ -1,5 +1,5 @@
 // Package inwx implements a DNS provider for solving the DNS-01 challenge using inwx dom robot
-package inwx
+package inwx // import "github.com/xenolf/lego/providers/dns/inwx"
 
 import (
 	"errors"
diff --git a/providers/dns/inwx/inwx_test.go b/providers/dns/inwx/inwx_test.go
index b4ec74ac..536201fd 100644
--- a/providers/dns/inwx/inwx_test.go
+++ b/providers/dns/inwx/inwx_test.go
@@ -1,4 +1,4 @@
-package inwx
+package inwx // import "github.com/xenolf/lego/providers/dns/inwx"
 
 import (
 	"testing"
diff --git a/providers/dns/lightsail/lightsail.go b/providers/dns/lightsail/lightsail.go
index 44a70bd1..cfa6f6ff 100644
--- a/providers/dns/lightsail/lightsail.go
+++ b/providers/dns/lightsail/lightsail.go
@@ -1,5 +1,5 @@
 // Package lightsail implements a DNS provider for solving the DNS-01 challenge using AWS Lightsail DNS.
-package lightsail
+package lightsail // import "github.com/xenolf/lego/providers/dns/lightsail"
 
 import (
 	"errors"
diff --git a/providers/dns/lightsail/lightsail_integration_test.go b/providers/dns/lightsail/lightsail_integration_test.go
index 4eb79976..9013b441 100644
--- a/providers/dns/lightsail/lightsail_integration_test.go
+++ b/providers/dns/lightsail/lightsail_integration_test.go
@@ -1,4 +1,4 @@
-package lightsail
+package lightsail // import "github.com/xenolf/lego/providers/dns/lightsail"
 
 import (
 	"testing"
diff --git a/providers/dns/lightsail/lightsail_test.go b/providers/dns/lightsail/lightsail_test.go
index 2ce2fde9..bcb179c1 100644
--- a/providers/dns/lightsail/lightsail_test.go
+++ b/providers/dns/lightsail/lightsail_test.go
@@ -1,4 +1,4 @@
-package lightsail
+package lightsail // import "github.com/xenolf/lego/providers/dns/lightsail"
 
 import (
 	"net/http/httptest"
diff --git a/providers/dns/lightsail/mock_server_test.go b/providers/dns/lightsail/mock_server_test.go
index a90d2f71..6530abe8 100644
--- a/providers/dns/lightsail/mock_server_test.go
+++ b/providers/dns/lightsail/mock_server_test.go
@@ -1,4 +1,4 @@
-package lightsail
+package lightsail // import "github.com/xenolf/lego/providers/dns/lightsail"
 
 import (
 	"fmt"
diff --git a/providers/dns/linode/linode_test.go b/providers/dns/linode/linode_test.go
index f8dbad5d..4fb6135f 100644
--- a/providers/dns/linode/linode_test.go
+++ b/providers/dns/linode/linode_test.go
@@ -1,4 +1,4 @@
-package linode
+package linode // import "github.com/xenolf/lego/providers/dns/linode"
 
 import (
 	"encoding/json"
diff --git a/providers/dns/linodev4/linodev4.go b/providers/dns/linodev4/linodev4.go
index eee0ddc9..9cfaf934 100644
--- a/providers/dns/linodev4/linodev4.go
+++ b/providers/dns/linodev4/linodev4.go
@@ -1,5 +1,5 @@
 // Package linodev4 implements a DNS provider for solving the DNS-01 challenge using Linode DNS and Linode's APIv4
-package linodev4
+package linodev4 // import "github.com/xenolf/lego/providers/dns/linodev4"
 
 import (
 	"context"
diff --git a/providers/dns/linodev4/linodev4_test.go b/providers/dns/linodev4/linodev4_test.go
index 97e5591f..22da1165 100644
--- a/providers/dns/linodev4/linodev4_test.go
+++ b/providers/dns/linodev4/linodev4_test.go
@@ -1,4 +1,4 @@
-package linodev4
+package linodev4 // import "github.com/xenolf/lego/providers/dns/linodev4"
 
 import (
 	"encoding/json"
diff --git a/providers/dns/namecheap/client.go b/providers/dns/namecheap/client.go
index 85bec85f..9844eaf0 100644
--- a/providers/dns/namecheap/client.go
+++ b/providers/dns/namecheap/client.go
@@ -1,4 +1,4 @@
-package namecheap
+package namecheap // import "github.com/xenolf/lego/providers/dns/namecheap"
 
 import (
 	"encoding/xml"
diff --git a/providers/dns/namecheap/namecheap.go b/providers/dns/namecheap/namecheap.go
index e4749ab6..b6e1d21f 100644
--- a/providers/dns/namecheap/namecheap.go
+++ b/providers/dns/namecheap/namecheap.go
@@ -1,5 +1,5 @@
 // Package namecheap implements a DNS provider for solving the DNS-01 challenge using namecheap DNS.
-package namecheap
+package namecheap // import "github.com/xenolf/lego/providers/dns/namecheap"
 
 import (
 	"errors"
diff --git a/providers/dns/namecheap/namecheap_test.go b/providers/dns/namecheap/namecheap_test.go
index 67a49d89..98e88571 100644
--- a/providers/dns/namecheap/namecheap_test.go
+++ b/providers/dns/namecheap/namecheap_test.go
@@ -1,4 +1,4 @@
-package namecheap
+package namecheap // import "github.com/xenolf/lego/providers/dns/namecheap"
 
 import (
 	"fmt"
diff --git a/providers/dns/namedotcom/namedotcom.go b/providers/dns/namedotcom/namedotcom.go
index 4f6137b4..f3977249 100644
--- a/providers/dns/namedotcom/namedotcom.go
+++ b/providers/dns/namedotcom/namedotcom.go
@@ -1,5 +1,5 @@
 // Package namedotcom implements a DNS provider for solving the DNS-01 challenge using Name.com's DNS service.
-package namedotcom
+package namedotcom // import "github.com/xenolf/lego/providers/dns/namedotcom"
 
 import (
 	"errors"
diff --git a/providers/dns/namedotcom/namedotcom_test.go b/providers/dns/namedotcom/namedotcom_test.go
index d2cae8a7..5d5884ea 100644
--- a/providers/dns/namedotcom/namedotcom_test.go
+++ b/providers/dns/namedotcom/namedotcom_test.go
@@ -1,4 +1,4 @@
-package namedotcom
+package namedotcom // import "github.com/xenolf/lego/providers/dns/namedotcom"
 
 import (
 	"testing"
diff --git a/providers/dns/netcup/internal/client.go b/providers/dns/netcup/internal/client.go
index 733bfd0b..caf1178e 100644
--- a/providers/dns/netcup/internal/client.go
+++ b/providers/dns/netcup/internal/client.go
@@ -1,4 +1,4 @@
-package internal
+package internal // import "github.com/xenolf/lego/providers/dns/netcup/internal"
 
 import (
 	"bytes"
diff --git a/providers/dns/netcup/internal/client_test.go b/providers/dns/netcup/internal/client_test.go
index 63bc93ba..65ea372c 100644
--- a/providers/dns/netcup/internal/client_test.go
+++ b/providers/dns/netcup/internal/client_test.go
@@ -1,4 +1,4 @@
-package internal
+package internal // import "github.com/xenolf/lego/providers/dns/netcup/internal"
 
 import (
 	"fmt"
diff --git a/providers/dns/netcup/netcup.go b/providers/dns/netcup/netcup.go
index 8e8e1b5b..b3301756 100644
--- a/providers/dns/netcup/netcup.go
+++ b/providers/dns/netcup/netcup.go
@@ -1,5 +1,5 @@
 // Package netcup implements a DNS Provider for solving the DNS-01 challenge using the netcup DNS API.
-package netcup
+package netcup // import "github.com/xenolf/lego/providers/dns/netcup"
 
 import (
 	"errors"
diff --git a/providers/dns/netcup/netcup_test.go b/providers/dns/netcup/netcup_test.go
index d095704f..57e8c00b 100644
--- a/providers/dns/netcup/netcup_test.go
+++ b/providers/dns/netcup/netcup_test.go
@@ -1,4 +1,4 @@
-package netcup
+package netcup // import "github.com/xenolf/lego/providers/dns/netcup"
 
 import (
 	"fmt"
diff --git a/providers/dns/nifcloud/internal/client.go b/providers/dns/nifcloud/internal/client.go
index a2eb8a76..e2b27a46 100644
--- a/providers/dns/nifcloud/internal/client.go
+++ b/providers/dns/nifcloud/internal/client.go
@@ -1,4 +1,4 @@
-package internal
+package internal // import "github.com/xenolf/lego/providers/dns/nifcloud/internal"
 
 import (
 	"bytes"
diff --git a/providers/dns/nifcloud/internal/client_test.go b/providers/dns/nifcloud/internal/client_test.go
index b9cec1b1..0e1d221b 100644
--- a/providers/dns/nifcloud/internal/client_test.go
+++ b/providers/dns/nifcloud/internal/client_test.go
@@ -1,4 +1,4 @@
-package internal
+package internal // import "github.com/xenolf/lego/providers/dns/nifcloud/internal"
 
 import (
 	"fmt"
diff --git a/providers/dns/nifcloud/nifcloud.go b/providers/dns/nifcloud/nifcloud.go
index 51b6b70a..79299c15 100644
--- a/providers/dns/nifcloud/nifcloud.go
+++ b/providers/dns/nifcloud/nifcloud.go
@@ -1,5 +1,5 @@
 // Package nifcloud implements a DNS provider for solving the DNS-01 challenge using NIFCLOUD DNS.
-package nifcloud
+package nifcloud // import "github.com/xenolf/lego/providers/dns/nifcloud"
 
 import (
 	"errors"
diff --git a/providers/dns/nifcloud/nifcloud_test.go b/providers/dns/nifcloud/nifcloud_test.go
index d8b7a255..29d15e8e 100644
--- a/providers/dns/nifcloud/nifcloud_test.go
+++ b/providers/dns/nifcloud/nifcloud_test.go
@@ -1,4 +1,4 @@
-package nifcloud
+package nifcloud // import "github.com/xenolf/lego/providers/dns/nifcloud"
 
 import (
 	"testing"
diff --git a/providers/dns/ns1/ns1.go b/providers/dns/ns1/ns1.go
index 63691248..54f29070 100644
--- a/providers/dns/ns1/ns1.go
+++ b/providers/dns/ns1/ns1.go
@@ -1,5 +1,5 @@
 // Package ns1 implements a DNS provider for solving the DNS-01 challenge using NS1 DNS.
-package ns1
+package ns1 // import "github.com/xenolf/lego/providers/dns/ns1"
 
 import (
 	"errors"
diff --git a/providers/dns/ns1/ns1_test.go b/providers/dns/ns1/ns1_test.go
index 44050c29..d076d066 100644
--- a/providers/dns/ns1/ns1_test.go
+++ b/providers/dns/ns1/ns1_test.go
@@ -1,4 +1,4 @@
-package ns1
+package ns1 // import "github.com/xenolf/lego/providers/dns/ns1"
 
 import (
 	"testing"
diff --git a/providers/dns/oraclecloud/oraclecloud.go b/providers/dns/oraclecloud/oraclecloud.go
index ee30e5d2..2db5dcc1 100644
--- a/providers/dns/oraclecloud/oraclecloud.go
+++ b/providers/dns/oraclecloud/oraclecloud.go
@@ -1,4 +1,4 @@
-package oraclecloud
+package oraclecloud // import "github.com/xenolf/lego/providers/dns/oraclecloud"
 
 import (
 	"context"
diff --git a/providers/dns/otc/client.go b/providers/dns/otc/client.go
index 1cd71f55..b1cc6dc3 100644
--- a/providers/dns/otc/client.go
+++ b/providers/dns/otc/client.go
@@ -1,4 +1,4 @@
-package otc
+package otc // import "github.com/xenolf/lego/providers/dns/otc"
 
 import (
 	"bytes"
diff --git a/providers/dns/otc/mock_test.go b/providers/dns/otc/mock_test.go
index 31778c01..e369a5d0 100644
--- a/providers/dns/otc/mock_test.go
+++ b/providers/dns/otc/mock_test.go
@@ -1,4 +1,4 @@
-package otc
+package otc // import "github.com/xenolf/lego/providers/dns/otc"
 
 import (
 	"fmt"
diff --git a/providers/dns/otc/otc.go b/providers/dns/otc/otc.go
index 4eeca22f..51d5f81e 100644
--- a/providers/dns/otc/otc.go
+++ b/providers/dns/otc/otc.go
@@ -1,5 +1,5 @@
 // Package otc implements a DNS provider for solving the DNS-01 challenge using Open Telekom Cloud Managed DNS.
-package otc
+package otc // import "github.com/xenolf/lego/providers/dns/otc"
 
 import (
 	"errors"
diff --git a/providers/dns/otc/otc_test.go b/providers/dns/otc/otc_test.go
index 001cae1d..f9ee2627 100644
--- a/providers/dns/otc/otc_test.go
+++ b/providers/dns/otc/otc_test.go
@@ -1,4 +1,4 @@
-package otc
+package otc // import "github.com/xenolf/lego/providers/dns/otc"
 
 import (
 	"fmt"
diff --git a/providers/dns/ovh/ovh.go b/providers/dns/ovh/ovh.go
index 6473b198..3e46ef18 100644
--- a/providers/dns/ovh/ovh.go
+++ b/providers/dns/ovh/ovh.go
@@ -1,5 +1,5 @@
 // Package ovh implements a DNS provider for solving the DNS-01 challenge using OVH DNS.
-package ovh
+package ovh // import "github.com/xenolf/lego/providers/dns/ovh"
 
 import (
 	"errors"
diff --git a/providers/dns/ovh/ovh_test.go b/providers/dns/ovh/ovh_test.go
index 574fad9c..0b069ad5 100644
--- a/providers/dns/ovh/ovh_test.go
+++ b/providers/dns/ovh/ovh_test.go
@@ -1,4 +1,4 @@
-package ovh
+package ovh // import "github.com/xenolf/lego/providers/dns/ovh"
 
 import (
 	"testing"
diff --git a/providers/dns/pdns/client.go b/providers/dns/pdns/client.go
index 88f892c3..cfe9f875 100644
--- a/providers/dns/pdns/client.go
+++ b/providers/dns/pdns/client.go
@@ -1,4 +1,4 @@
-package pdns
+package pdns // import "github.com/xenolf/lego/providers/dns/pdns"
 
 import (
 	"encoding/json"
diff --git a/providers/dns/pdns/pdns.go b/providers/dns/pdns/pdns.go
index 19510289..ac2b7d36 100644
--- a/providers/dns/pdns/pdns.go
+++ b/providers/dns/pdns/pdns.go
@@ -1,5 +1,5 @@
 // Package pdns implements a DNS provider for solving the DNS-01 challenge using PowerDNS nameserver.
-package pdns
+package pdns // import "github.com/xenolf/lego/providers/dns/pdns"
 
 import (
 	"bytes"
diff --git a/providers/dns/pdns/pdns_test.go b/providers/dns/pdns/pdns_test.go
index 632582f1..b4b9b60f 100644
--- a/providers/dns/pdns/pdns_test.go
+++ b/providers/dns/pdns/pdns_test.go
@@ -1,4 +1,4 @@
-package pdns
+package pdns // import "github.com/xenolf/lego/providers/dns/pdns"
 
 import (
 	"net/url"
diff --git a/providers/dns/rackspace/client.go b/providers/dns/rackspace/client.go
index e1085626..ee4cb77d 100644
--- a/providers/dns/rackspace/client.go
+++ b/providers/dns/rackspace/client.go
@@ -1,4 +1,4 @@
-package rackspace
+package rackspace // import "github.com/xenolf/lego/providers/dns/rackspace"
 
 import (
 	"bytes"
diff --git a/providers/dns/rackspace/rackspace.go b/providers/dns/rackspace/rackspace.go
index a0ddb4aa..bddc9140 100644
--- a/providers/dns/rackspace/rackspace.go
+++ b/providers/dns/rackspace/rackspace.go
@@ -1,5 +1,5 @@
 // Package rackspace implements a DNS provider for solving the DNS-01 challenge using rackspace DNS.
-package rackspace
+package rackspace // import "github.com/xenolf/lego/providers/dns/rackspace"
 
 import (
 	"bytes"
diff --git a/providers/dns/rackspace/rackspace_mock_test.go b/providers/dns/rackspace/rackspace_mock_test.go
index 0874543d..48b516de 100644
--- a/providers/dns/rackspace/rackspace_mock_test.go
+++ b/providers/dns/rackspace/rackspace_mock_test.go
@@ -1,4 +1,4 @@
-package rackspace
+package rackspace // import "github.com/xenolf/lego/providers/dns/rackspace"
 
 const recordDeleteMock = `
 {
diff --git a/providers/dns/rackspace/rackspace_test.go b/providers/dns/rackspace/rackspace_test.go
index 361d5f77..f172dcc7 100644
--- a/providers/dns/rackspace/rackspace_test.go
+++ b/providers/dns/rackspace/rackspace_test.go
@@ -1,4 +1,4 @@
-package rackspace
+package rackspace // import "github.com/xenolf/lego/providers/dns/rackspace"
 
 import (
 	"fmt"
diff --git a/providers/dns/route53/mock_test.go b/providers/dns/route53/mock_test.go
index 79b0bbaf..24d5b05e 100644
--- a/providers/dns/route53/mock_test.go
+++ b/providers/dns/route53/mock_test.go
@@ -1,4 +1,4 @@
-package route53
+package route53 // import "github.com/xenolf/lego/providers/dns/route53"
 
 import (
 	"fmt"
diff --git a/providers/dns/route53/route53_integration_test.go b/providers/dns/route53/route53_integration_test.go
index acc301bc..7c7c264d 100644
--- a/providers/dns/route53/route53_integration_test.go
+++ b/providers/dns/route53/route53_integration_test.go
@@ -1,4 +1,4 @@
-package route53
+package route53 // import "github.com/xenolf/lego/providers/dns/route53"
 
 import (
 	"testing"
diff --git a/providers/dns/route53/route53_test.go b/providers/dns/route53/route53_test.go
index 228cfbfa..de062972 100644
--- a/providers/dns/route53/route53_test.go
+++ b/providers/dns/route53/route53_test.go
@@ -1,4 +1,4 @@
-package route53
+package route53 // import "github.com/xenolf/lego/providers/dns/route53"
 
 import (
 	"net/http/httptest"
diff --git a/providers/dns/selectel/internal/client.go b/providers/dns/selectel/internal/client.go
index 8457bc4a..144c2da9 100644
--- a/providers/dns/selectel/internal/client.go
+++ b/providers/dns/selectel/internal/client.go
@@ -1,4 +1,4 @@
-package internal
+package internal // import "github.com/xenolf/lego/providers/dns/selectel/internal"
 
 import (
 	"bytes"
diff --git a/providers/dns/stackpath/client.go b/providers/dns/stackpath/client.go
index 4665ca56..e7c0a5a3 100644
--- a/providers/dns/stackpath/client.go
+++ b/providers/dns/stackpath/client.go
@@ -1,4 +1,4 @@
-package stackpath
+package stackpath // import "github.com/xenolf/lego/providers/dns/stackpath"
 
 import (
 	"bytes"
diff --git a/providers/dns/stackpath/stackpath.go b/providers/dns/stackpath/stackpath.go
index df05aee7..56aa3b7d 100644
--- a/providers/dns/stackpath/stackpath.go
+++ b/providers/dns/stackpath/stackpath.go
@@ -1,6 +1,6 @@
 // Package stackpath implements a DNS provider for solving the DNS-01 challenge using Stackpath DNS.
 // https://developer.stackpath.com/en/api/dns/
-package stackpath
+package stackpath // import "github.com/xenolf/lego/providers/dns/stackpath"
 
 import (
 	"context"
diff --git a/providers/dns/stackpath/stackpath_test.go b/providers/dns/stackpath/stackpath_test.go
index 050c5cae..09ac5404 100644
--- a/providers/dns/stackpath/stackpath_test.go
+++ b/providers/dns/stackpath/stackpath_test.go
@@ -1,4 +1,4 @@
-package stackpath
+package stackpath // import "github.com/xenolf/lego/providers/dns/stackpath"
 
 import (
 	"net/http"
diff --git a/providers/dns/transip/transip.go b/providers/dns/transip/transip.go
index ee88af28..e023383e 100644
--- a/providers/dns/transip/transip.go
+++ b/providers/dns/transip/transip.go
@@ -1,5 +1,5 @@
 // Package transip implements a DNS provider for solving the DNS-01 challenge using TransIP.
-package transip
+package transip // import "github.com/xenolf/lego/providers/dns/transip"
 
 import (
 	"errors"
diff --git a/providers/dns/transip/transip_test.go b/providers/dns/transip/transip_test.go
index 464b9424..6413633f 100644
--- a/providers/dns/transip/transip_test.go
+++ b/providers/dns/transip/transip_test.go
@@ -1,4 +1,4 @@
-package transip
+package transip // import "github.com/xenolf/lego/providers/dns/transip"
 
 import (
 	"encoding/xml"
diff --git a/providers/dns/vegadns/vegadns.go b/providers/dns/vegadns/vegadns.go
index c1e218da..a6ee2bfa 100644
--- a/providers/dns/vegadns/vegadns.go
+++ b/providers/dns/vegadns/vegadns.go
@@ -1,5 +1,5 @@
 // Package vegadns implements a DNS provider for solving the DNS-01 challenge using VegaDNS.
-package vegadns
+package vegadns // import "github.com/xenolf/lego/providers/dns/vegadns"
 
 import (
 	"errors"
diff --git a/providers/dns/vegadns/vegadns_mock_test.go b/providers/dns/vegadns/vegadns_mock_test.go
index 5a705e09..faa2b11f 100644
--- a/providers/dns/vegadns/vegadns_mock_test.go
+++ b/providers/dns/vegadns/vegadns_mock_test.go
@@ -1,4 +1,4 @@
-package vegadns
+package vegadns // import "github.com/xenolf/lego/providers/dns/vegadns"
 
 const tokenResponseMock = `
 {
diff --git a/providers/dns/vegadns/vegadns_test.go b/providers/dns/vegadns/vegadns_test.go
index 6de4f404..e0a5ac10 100644
--- a/providers/dns/vegadns/vegadns_test.go
+++ b/providers/dns/vegadns/vegadns_test.go
@@ -1,6 +1,6 @@
 // Package vegadns implements a DNS provider for solving the DNS-01
 // challenge using VegaDNS.
-package vegadns
+package vegadns // import "github.com/xenolf/lego/providers/dns/vegadns"
 
 import (
 	"fmt"
diff --git a/providers/dns/vscale/internal/client.go b/providers/dns/vscale/internal/client.go
index 7ce7495e..f2649bcc 100644
--- a/providers/dns/vscale/internal/client.go
+++ b/providers/dns/vscale/internal/client.go
@@ -1,4 +1,4 @@
-package internal
+package internal // import "github.com/xenolf/lego/providers/dns/vscale/internal"
 
 import (
 	"bytes"
diff --git a/providers/dns/vultr/vultr.go b/providers/dns/vultr/vultr.go
index 9faa3d60..2da61db1 100644
--- a/providers/dns/vultr/vultr.go
+++ b/providers/dns/vultr/vultr.go
@@ -1,6 +1,6 @@
 // Package vultr implements a DNS provider for solving the DNS-01 challenge using the vultr DNS.
 // See https://www.vultr.com/api/#dns
-package vultr
+package vultr // import "github.com/xenolf/lego/providers/dns/vultr"
 
 import (
 	"crypto/tls"
diff --git a/providers/dns/vultr/vultr_test.go b/providers/dns/vultr/vultr_test.go
index f73586a4..cb17bbbe 100644
--- a/providers/dns/vultr/vultr_test.go
+++ b/providers/dns/vultr/vultr_test.go
@@ -1,4 +1,4 @@
-package vultr
+package vultr // import "github.com/xenolf/lego/providers/dns/vultr"
 
 import (
 	"testing"
diff --git a/providers/dns/zoneee/client.go b/providers/dns/zoneee/client.go
index b48808b8..3590201f 100644
--- a/providers/dns/zoneee/client.go
+++ b/providers/dns/zoneee/client.go
@@ -1,4 +1,4 @@
-package zoneee
+package zoneee // import "github.com/xenolf/lego/providers/dns/zoneee"
 
 import (
 	"bytes"
diff --git a/providers/dns/zoneee/zoneee.go b/providers/dns/zoneee/zoneee.go
index 0b136e30..f27a1811 100644
--- a/providers/dns/zoneee/zoneee.go
+++ b/providers/dns/zoneee/zoneee.go
@@ -1,5 +1,5 @@
 // Package zoneee implements a DNS provider for solving the DNS-01 challenge through zone.ee.
-package zoneee
+package zoneee // import "github.com/xenolf/lego/providers/dns/zoneee"
 
 import (
 	"errors"
diff --git a/providers/http/memcached/memcached.go b/providers/http/memcached/memcached.go
index d64d7511..60e092dd 100644
--- a/providers/http/memcached/memcached.go
+++ b/providers/http/memcached/memcached.go
@@ -1,6 +1,6 @@
 // Package memcached implements a HTTP provider for solving the HTTP-01 challenge using memcached
 // in combination with a webserver.
-package memcached
+package memcached // import "github.com/xenolf/lego/providers/http/memcached"
 
 import (
 	"fmt"
diff --git a/providers/http/memcached/memcached_test.go b/providers/http/memcached/memcached_test.go
index bc994924..69c161ca 100644
--- a/providers/http/memcached/memcached_test.go
+++ b/providers/http/memcached/memcached_test.go
@@ -1,4 +1,4 @@
-package memcached
+package memcached // import "github.com/xenolf/lego/providers/http/memcached"
 
 import (
 	"os"
diff --git a/providers/http/webroot/webroot.go b/providers/http/webroot/webroot.go
index 371db0f4..dc7caba9 100644
--- a/providers/http/webroot/webroot.go
+++ b/providers/http/webroot/webroot.go
@@ -1,5 +1,5 @@
 // Package webroot implements a HTTP provider for solving the HTTP-01 challenge using web server's root path.
-package webroot
+package webroot // import "github.com/xenolf/lego/providers/http/webroot"
 
 import (
 	"fmt"
diff --git a/providers/http/webroot/webroot_test.go b/providers/http/webroot/webroot_test.go
index 5fccae37..f4e50b45 100644
--- a/providers/http/webroot/webroot_test.go
+++ b/providers/http/webroot/webroot_test.go
@@ -1,4 +1,4 @@
-package webroot
+package webroot // import "github.com/xenolf/lego/providers/http/webroot"
 
 import (
 	"io/ioutil"
diff --git a/registration/registar.go b/registration/registar.go
index a1b850ec..1debadba 100644
--- a/registration/registar.go
+++ b/registration/registar.go
@@ -1,4 +1,4 @@
-package registration
+package registration // import "github.com/xenolf/lego/registration"
 
 import (
 	"errors"
diff --git a/registration/registar_test.go b/registration/registar_test.go
index d011d6d0..a5435012 100644
--- a/registration/registar_test.go
+++ b/registration/registar_test.go
@@ -1,4 +1,4 @@
-package registration
+package registration // import "github.com/xenolf/lego/registration"
 
 import (
 	"crypto/rand"
diff --git a/registration/user.go b/registration/user.go
index 1e29300e..d8d344ae 100644
--- a/registration/user.go
+++ b/registration/user.go
@@ -1,4 +1,4 @@
-package registration
+package registration // import "github.com/xenolf/lego/registration"
 
 import (
 	"crypto"
diff --git a/registration/user_test.go b/registration/user_test.go
index b9c5de33..d6a2444e 100644
--- a/registration/user_test.go
+++ b/registration/user_test.go
@@ -1,4 +1,4 @@
-package registration
+package registration // import "github.com/xenolf/lego/registration"
 
 import (
 	"crypto"