diff --git a/cmd/dlv/dlv_test.go b/cmd/dlv/dlv_test.go
index 2b057c2280..3411df0e03 100644
--- a/cmd/dlv/dlv_test.go
+++ b/cmd/dlv/dlv_test.go
@@ -1,4 +1,4 @@
-package main_test
+package dlv_test // gopdlv: change application name
 
 import (
 	"bufio"
diff --git a/cmd/dlv/main.go b/cmd/dlv/main.go
index dcb92c457b..fc1b38f711 100644
--- a/cmd/dlv/main.go
+++ b/cmd/dlv/main.go
@@ -1,4 +1,4 @@
-package main
+package dlv // gopdlv: change application name
 
 import (
 	"os"
@@ -11,7 +11,7 @@ import (
 // Build is the git sha of this binaries build.
 var Build string
 
-func main() {
+func Main() {
 	if Build != "" {
 		version.DelveVersion.Build = Build
 	}
diff --git a/cmd/dlv/tools.go b/cmd/dlv/tools.go
index 8e37e11b47..67aa24eb49 100644
--- a/cmd/dlv/tools.go
+++ b/cmd/dlv/tools.go
@@ -1,4 +1,4 @@
-package main
+package dlv // gopdlv: change application name
 
 // List packages used by _scripts
 
diff --git a/cmd/gopdlv/gopdlv.go b/cmd/gopdlv/gopdlv.go
new file mode 100644
index 0000000000..c012e85b5f
--- /dev/null
+++ b/cmd/gopdlv/gopdlv.go
@@ -0,0 +1,9 @@
+package main
+
+import (
+	"github.com/go-delve/delve/cmd/dlv"
+)
+
+func main() {
+	dlv.Main()
+}