.gitmodules                       |  3 ---
 BSDmakefile                       |  3 ---
 GNUmakefile                       |  3 ---
 Makefile                          | 16 ++++++++++++++++
 common.mk                         |  5 -----
 src/cypherpunks.ru/gohpenc/go.mod |  5 +++++
 src/cypherpunks.ru/gohpenc/go.sum |  8 ++++++++

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 6607578f3a969fa132c48e8c60f0ec8755dd3e09..0000000000000000000000000000000000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "src/golang.org/x/crypto"]
-	path = src/golang.org/x/crypto
-	url = https://go.googlesource.com/crypto
diff --git a/BSDmakefile b/BSDmakefile
deleted file mode 100644
index 3b72febfe047f0f9dd56a730a7d6d38bf2b89c8d..0000000000000000000000000000000000000000
--- a/BSDmakefile
+++ /dev/null
@@ -1,3 +0,0 @@
-GOPATH != pwd
-
-include common.mk
diff --git a/GNUmakefile b/GNUmakefile
deleted file mode 100644
index 0f99dc2083b9bf5d201e91bd1745ad2868dbc88f..0000000000000000000000000000000000000000
--- a/GNUmakefile
+++ /dev/null
@@ -1,3 +0,0 @@
-GOPATH = $(shell pwd)
-
-include common.mk
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..95f8740fc36e88484f98d156ae6e3ec14f2f6a1d
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,16 @@
+GO ?= go
+GOPATH ?= $(PWD)/gopath
+SRC := $(PWD)/src/cypherpunks.ru/gohpenc
+BIN := $(PWD)/bin
+
+all: $(BIN)/gohpenc
+
+$(BIN):
+	mkdir -p $(BIN)
+
+$(BIN)/gohpenc: $(BIN)
+	cd $(SRC) ; GOPATH=$(GOPATH) $(GO) build
+	mv $(SRC)/gohpenc bin
+
+clean:
+	rm -rf $(BIN)
diff --git a/common.mk b/common.mk
deleted file mode 100644
index 4d8f4fba771a71c358cc197833fce7e50f0c959f..0000000000000000000000000000000000000000
--- a/common.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-gohpenc:
-	GOPATH=$(GOPATH) go build cypherpunks.ru/gohpenc
-
-clean:
-	rm -f gohpenc
diff --git a/src/cypherpunks.ru/gohpenc/go.mod b/src/cypherpunks.ru/gohpenc/go.mod
new file mode 100644
index 0000000000000000000000000000000000000000..4b097542646be60f45742f9e5e1656e2bd0f1ffb
--- /dev/null
+++ b/src/cypherpunks.ru/gohpenc/go.mod
@@ -0,0 +1,5 @@
+module cypherpunks.ru/gohpenc
+
+go 1.12
+
+require golang.org/x/crypto v0.0.0-20190506204251-e1dfcc566284
diff --git a/src/cypherpunks.ru/gohpenc/go.sum b/src/cypherpunks.ru/gohpenc/go.sum
new file mode 100644
index 0000000000000000000000000000000000000000..46cc1a71b0acbe645d87d54766ec7b94632e83b0
--- /dev/null
+++ b/src/cypherpunks.ru/gohpenc/go.sum
@@ -0,0 +1,8 @@
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190506204251-e1dfcc566284 h1:rlLehGeYg6jfoyz/eDqDU1iRXLKfR42nnNh57ytKEWo=
+golang.org/x/crypto v0.0.0-20190506204251-e1dfcc566284/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=