diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37f75e952b2..3597172b59c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## HEAD
 
+### Add support for WASI port
+* Add build tags for wasip1 GOOS
+
 ### Add support for IBM Z operating system z/OS
 * Add build tags for zos
 
diff --git a/x509/root_wasip1.go b/x509/root_wasip1.go
new file mode 100644
index 00000000000..e5cf98e0af0
--- /dev/null
+++ b/x509/root_wasip1.go
@@ -0,0 +1,19 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build wasip1
+// +build wasip1
+
+package x509
+
+// Possible certificate files; stop after finding one.
+var certFiles = []string{}
+
+func loadSystemRoots() (*CertPool, error) {
+	return NewCertPool(), nil
+}
+
+func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) {
+	return nil, nil
+}