diff --git a/utils/swift_build_support/swift_build_support/targets.py b/utils/swift_build_support/swift_build_support/targets.py
index 34364458ec736..05966defe2861 100644
--- a/utils/swift_build_support/swift_build_support/targets.py
+++ b/utils/swift_build_support/swift_build_support/targets.py
@@ -243,6 +243,8 @@ class StdlibDeploymentTarget(object):
 
     Haiku = Platform("haiku", archs=["x86_64"])
 
+    WASI = Platform("wasi", archs=["wasm32"])
+
     # The list of known platforms.
     known_platforms = [
         OSX,
@@ -256,7 +258,8 @@ class StdlibDeploymentTarget(object):
         Cygwin,
         Android,
         Windows,
-        Haiku]
+        Haiku,
+        WASI]
 
     # Cache of targets by name.
     _targets_by_name = dict((target.name, target)
@@ -338,6 +341,10 @@ def host_target():
             if machine == 'x86_64':
                 return StdlibDeploymentTarget.Haiku.x86_64
 
+        elif system == 'WASI':
+            if machine == 'wasm32':
+                return StdlibDeploymentTarget.WASI.wasm32
+
         raise NotImplementedError('System "%s" with architecture "%s" is not '
                                   'supported' % (system, machine))