diff --git a/lang/go/Makefile b/lang/go18/Makefile
similarity index 100%
rename from lang/go/Makefile
rename to lang/go18/Makefile
diff --git a/lang/go/distinfo b/lang/go18/distinfo
similarity index 100%
rename from lang/go/distinfo
rename to lang/go18/distinfo
diff --git a/lang/go/files/patch-src_cmd_go_internal_modload_vendor.go b/lang/go18/files/patch-src_cmd_go_internal_modload_vendor.go
similarity index 100%
rename from lang/go/files/patch-src_cmd_go_internal_modload_vendor.go
rename to lang/go18/files/patch-src_cmd_go_internal_modload_vendor.go
diff --git a/lang/go/pkg-descr b/lang/go18/pkg-descr
similarity index 100%
rename from lang/go/pkg-descr
rename to lang/go18/pkg-descr
diff --git a/lang/go/pkg-plist.aarch64 b/lang/go18/pkg-plist.aarch64
similarity index 100%
rename from lang/go/pkg-plist.aarch64
rename to lang/go18/pkg-plist.aarch64
diff --git a/lang/go/pkg-plist.amd64 b/lang/go18/pkg-plist.amd64
similarity index 100%
rename from lang/go/pkg-plist.amd64
rename to lang/go18/pkg-plist.amd64