diff --git a/README.md b/README.md
index 1b4e18637..6a3659b7a 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ Create and save `index.html` page with the following contents:
 
 ```html
 <html>
-  <script src="https://cdn.jsdelivr.net/npm/@ruby/3.4-wasm-wasi@2.7.2/dist/browser.script.iife.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.7.2/dist/browser.script.iife.js"></script>
   <script type="text/ruby">
     require "js"
 
@@ -40,18 +40,18 @@ Dependencies: [wasmtime](https://github.com/bytecodealliance/wasmtime)
 ```console
 $ gem install ruby_wasm
 # Download a prebuilt Ruby release
-$ curl -LO https://github.com/ruby/ruby.wasm/releases/latest/download/ruby-3.4-wasm32-unknown-wasip1-full.tar.gz
-$ tar xfz ruby-3.4-wasm32-unknown-wasip1-full.tar.gz
+$ curl -LO https://github.com/ruby/ruby.wasm/releases/latest/download/ruby-4.0-wasm32-unknown-wasip1-full.tar.gz
+$ tar xfz ruby-4.0-wasm32-unknown-wasip1-full.tar.gz
 
 # Extract ruby binary not to pack itself
-$ mv ruby-3.4-wasm32-unknown-wasip1-full/usr/local/bin/ruby ruby.wasm
+$ mv ruby-4.0-wasm32-unknown-wasip1-full/usr/local/bin/ruby ruby.wasm
 
 # Put your app code
 $ mkdir src
 $ echo "puts 'Hello'" > src/my_app.rb
 
 # Pack the whole directory under /usr and your app dir
-$ rbwasm pack ruby.wasm --dir ./src::/src --dir ./ruby-3.4-wasm32-unknown-wasip1-full/usr::/usr -o my-ruby-app.wasm
+$ rbwasm pack ruby.wasm --dir ./src::/src --dir ./ruby-4.0-wasm32-unknown-wasip1-full/usr::/usr -o my-ruby-app.wasm
 
 # Run the packed scripts
 $ wasmtime my-ruby-app.wasm /src/my_app.rb
@@ -71,6 +71,11 @@ See the `README.md` of each package for more detail and its usage.
     </tr>
   </thead>
   <tbody>
+    <tr>
+      <td><a href="/packages/npm-packages/ruby-4.0-wasm-wasi">@ruby/4.0-wasm-wasi</a></td>
+      <td>CRuby 4.0 built on WASI with JS interop support</td>
+      <td><a href="https://www.npmjs.com/package/@ruby/4.0-wasm-wasi" rel="nofollow"><img src="https://badge.fury.io/js/@ruby%2F4.0-wasm-wasi.svg" alt="npm version" style="max-width: 100%;"></a></td>
+    </tr>
     <tr>
       <td><a href="/packages/npm-packages/ruby-3.4-wasm-wasi">@ruby/3.4-wasm-wasi</a></td>
       <td>CRuby 3.4 built on WASI with JS interop support</td>
diff --git a/Rakefile b/Rakefile
index 4d7fe9bca..71b4f288e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -9,7 +9,7 @@ require "ruby_wasm/rake_task"
 require "ruby_wasm/packager"
 require "ruby_wasm/cli"
 
-BUILD_SOURCES = %w[3.4 3.3 3.2 head]
+BUILD_SOURCES = %w[4.0 3.4 3.3 3.2 head]
 BUILD_PROFILES = %w[full minimal]
 
 BUILDS =
@@ -38,6 +38,12 @@ NPM_PACKAGES = [
     target: "wasm32-unknown-wasip2",
     enable_component_model: true
   },
+  {
+    name: "ruby-4.0-wasm-wasi",
+    ruby_version: "4.0",
+    gemfile: "packages/npm-packages/ruby-4.0-wasm-wasi/Gemfile",
+    target: "wasm32-unknown-wasip1"
+  },
   {
     name: "ruby-3.4-wasm-wasi",
     ruby_version: "3.4",
diff --git a/docs/cheat_sheet.md b/docs/cheat_sheet.md
index 99d0ee06a..63125bae5 100644
--- a/docs/cheat_sheet.md
+++ b/docs/cheat_sheet.md
@@ -8,10 +8,10 @@
 
 ## Node.js
 
-To install the package, install `@ruby/3.4-wasm-wasi` and `@ruby/wasm-wasi` from npm:
+To install the package, install `@ruby/4.0-wasm-wasi` and `@ruby/wasm-wasi` from npm:
 
 ```console
-npm install --save @ruby/3.4-wasm-wasi @ruby/wasm-wasi
+npm install --save @ruby/4.0-wasm-wasi @ruby/wasm-wasi
 ```
 
 Then instantiate a Ruby VM by the following code:
@@ -20,7 +20,7 @@ Then instantiate a Ruby VM by the following code:
 import fs from "fs/promises";
 import { DefaultRubyVM } from "@ruby/wasm-wasi/dist/node";
 
-const binary = await fs.readFile("./node_modules/@ruby/3.4-wasm-wasi/dist/ruby.wasm");
+const binary = await fs.readFile("./node_modules/@ruby/4.0-wasm-wasi/dist/ruby.wasm");
 const module = await WebAssembly.compile(binary);
 const { vm } = await DefaultRubyVM(module);
 vm.eval(`puts "hello world"`);
@@ -38,7 +38,7 @@ The easiest way to run Ruby on browser is to use `browser.script.iife.js` script
 
 ```html
 <html>
-  <script src="https://cdn.jsdelivr.net/npm/@ruby/3.4-wasm-wasi@2.7.2/dist/browser.script.iife.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.7.2/dist/browser.script.iife.js"></script>
   <script type="text/ruby">
     require "js"
     JS.global[:document].write "Hello, world!"
@@ -52,7 +52,7 @@ If you want to control Ruby VM from JavaScript, you can use `@ruby/wasm-wasi` pa
 <html>
   <script type="module">
     import { DefaultRubyVM } from "https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.7.2/dist/browser/+esm";
-    const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/3.4-wasm-wasi@2.7.2/dist/ruby+stdlib.wasm");
+    const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.7.2/dist/ruby+stdlib.wasm");
     const module = await WebAssembly.compileStreaming(response);
     const { vm } = await DefaultRubyVM(module);
 
@@ -73,7 +73,7 @@ If you want to control Ruby VM from JavaScript, you can use `@ruby/wasm-wasi` pa
   <script>
     const main = async () => {
       const { DefaultRubyVM } = window["ruby-wasm-wasi"];
-      const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/3.4-wasm-wasi@2.7.2/dist/ruby+stdlib.wasm");
+      const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.7.2/dist/ruby+stdlib.wasm");
       const module = await WebAssembly.compileStreaming(response);
       const { vm } = await DefaultRubyVM(module);
 
@@ -128,7 +128,7 @@ end
 
 ```html
 <html>
-  <script src="https://cdn.jsdelivr.net/npm/@ruby/3.4-wasm-wasi@2.7.2/dist/browser.script.iife.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.7.2/dist/browser.script.iife.js"></script>
   <script type="text/ruby" data-eval="async">
     require "js"
 
@@ -144,7 +144,7 @@ Or using `@ruby/wasm-wasi` package API `RubyVM#evalAsync`:
 <html>
   <script type="module">
     import { DefaultRubyVM } from "https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.7.2/dist/browser/+esm";
-    const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/3.4-wasm-wasi@2.7.2/dist/ruby+stdlib.wasm");
+    const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.7.2/dist/ruby+stdlib.wasm");
     const module = await WebAssembly.compileStreaming(response);
     const { vm } = await DefaultRubyVM(module);
 
diff --git a/lib/ruby_wasm/cli.rb b/lib/ruby_wasm/cli.rb
index 3b079b689..c0b2b73a1 100644
--- a/lib/ruby_wasm/cli.rb
+++ b/lib/ruby_wasm/cli.rb
@@ -252,6 +252,16 @@ def self.build_config_aliases(root)
           all_default_exts: RubyWasm::Packager::ALL_DEFAULT_EXTS,
           wasi_sdk_version: "24.0"
         },
+        {
+          name: "4.0",
+          src: {
+            type: "tarball",
+            url: "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0.tar.gz"
+          },
+          all_default_exts:
+            "cgi/escape,continuation,coverage,date,digest/bubblebabble,digest,digest/md5,digest/rmd160,digest/sha1,digest/sha2,etc,fcntl,json,json/generator,json/parser,objspace,pathname,psych,rbconfig/sizeof,ripper,stringio,strscan,monitor,zlib,openssl",
+          wasi_sdk_version: "24.0"
+        },
         {
           name: "3.4",
           src: {
diff --git a/package-lock.json b/package-lock.json
index d6c0c1731..14f377272 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1479,6 +1479,10 @@
             "resolved": "packages/npm-packages/ruby-3.4-wasm-wasi",
             "link": true
         },
+        "node_modules/@ruby/4.0-wasm-wasi": {
+            "resolved": "packages/npm-packages/ruby-4.0-wasm-wasi",
+            "link": true
+        },
         "node_modules/@ruby/head-wasm-emscripten": {
             "resolved": "packages/npm-packages/ruby-head-wasm-emscripten",
             "link": true
@@ -3598,6 +3602,14 @@
                 "@ruby/wasm-wasi": "^2.0.0"
             }
         },
+        "packages/npm-packages/ruby-4.0-wasm-wasi": {
+            "name": "@ruby/4.0-wasm-wasi",
+            "version": "2.7.2",
+            "license": "MIT",
+            "dependencies": {
+                "@ruby/wasm-wasi": "^2.0.0"
+            }
+        },
         "packages/npm-packages/ruby-head-wasm-emscripten": {
             "name": "@ruby/head-wasm-emscripten",
             "version": "2.7.2",
diff --git a/packages/npm-packages/ruby-4.0-wasm-wasi/.gitignore b/packages/npm-packages/ruby-4.0-wasm-wasi/.gitignore
new file mode 100644
index 000000000..cbb80a5cd
--- /dev/null
+++ b/packages/npm-packages/ruby-4.0-wasm-wasi/.gitignore
@@ -0,0 +1,4 @@
+*.tgz
+/tmp
+/bundle
+/vendor
diff --git a/packages/npm-packages/ruby-4.0-wasm-wasi/Gemfile b/packages/npm-packages/ruby-4.0-wasm-wasi/Gemfile
new file mode 100644
index 000000000..35a14732c
--- /dev/null
+++ b/packages/npm-packages/ruby-4.0-wasm-wasi/Gemfile
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+# We build ./vendor/cache/js-{version}.gem just before evaluating this Gemfile
+# so that Bundler builds extensions even from the local gem. (gem extensions
+# from "path:" gems are not built by Bundler.)
+# Thus even we specify version of "js" gem here, it should always installed
+# from the ./vendor/cache/js-{version}.gem, not from rubygems.org. To achieve this,
+# we always use non-exist version during development.
+require_relative "../../gems/js/lib/js/version.rb"
+gem "js", JS::VERSION
+gem "ruby_wasm", path: "../../../", group: [:build]
+gem "power_assert"
+gem "test-unit"
diff --git a/packages/npm-packages/ruby-4.0-wasm-wasi/Gemfile.lock b/packages/npm-packages/ruby-4.0-wasm-wasi/Gemfile.lock
new file mode 100644
index 000000000..a23102d1a
--- /dev/null
+++ b/packages/npm-packages/ruby-4.0-wasm-wasi/Gemfile.lock
@@ -0,0 +1,27 @@
+PATH
+  remote: ../../..
+  specs:
+    ruby_wasm (2.7.2.dev)
+      logger
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    js (2.7.2.dev)
+    logger (1.7.0)
+    power_assert (2.0.3)
+    test-unit (3.6.2)
+      power_assert
+
+PLATFORMS
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  js (= 2.7.2.dev)
+  power_assert
+  ruby_wasm!
+  test-unit
+
+BUNDLED WITH
+   2.6.4
diff --git a/packages/npm-packages/ruby-4.0-wasm-wasi/README.md b/packages/npm-packages/ruby-4.0-wasm-wasi/README.md
new file mode 100644
index 000000000..69e4c01e7
--- /dev/null
+++ b/packages/npm-packages/ruby-4.0-wasm-wasi/README.md
@@ -0,0 +1,7 @@
+# @ruby/4.0-wasm-wasi
+
+[![npm version](https://badge.fury.io/js/@ruby%2F4.0-wasm-wasi.svg)](https://www.npmjs.com/package/@ruby/4.0-wasm-wasi)
+
+This package provides WebAssembly binaries of CRuby built from the latest `4.0` source code targeting environments compatible with WASI Preview1.
+
+See [`@ruby/wasm-wasi`](https://github.com/ruby/ruby.wasm/blob/main/packages/npm-packages/ruby-wasm-wasi/README.md) for how to use this package.
diff --git a/packages/npm-packages/ruby-4.0-wasm-wasi/package.json b/packages/npm-packages/ruby-4.0-wasm-wasi/package.json
new file mode 100644
index 000000000..ee8d12405
--- /dev/null
+++ b/packages/npm-packages/ruby-4.0-wasm-wasi/package.json
@@ -0,0 +1,55 @@
+{
+  "name": "@ruby/4.0-wasm-wasi",
+  "version": "2.7.2",
+  "description": "Ruby 4.0 built on WASI",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
+  "exports": {
+    ".": {
+      "browser": "./dist/esm/index.js",
+      "umd": "./dist/umd/index.js",
+      "import": "./dist/esm/index.js",
+      "require": "./dist/cjs/index.js"
+    },
+    "./dist/*": {
+      "browser": "./dist/esm/*.js",
+      "umd": "./dist/umd/*.js",
+      "import": "./dist/esm/*.js",
+      "require": "./dist/cjs/*.js"
+    },
+    "./dist/*.wasm": {
+      "browser": "./dist/*.wasm",
+      "umd": "./dist/*.wasm",
+      "import": "./dist/*.wasm",
+      "require": "./dist/*.wasm"
+    }
+  },
+  "files": [
+    "dist",
+    "README.md"
+  ],
+  "scripts": {
+    "test": "RUBY_NPM_PACKAGE_ROOT=../ruby-4.0-wasm-wasi npm -C ../ruby-wasm-wasi run test:run",
+    "build:deps": "cd ../ruby-wasm-wasi && npm run build",
+    "build:static:files": "../ruby-wasm-wasi/tools/pack-static-files.sh ./dist",
+    "build:static:compat": "../ruby-wasm-wasi/tools/pack-compat-shim.mjs --dist=./dist --pkg=ruby-4.0-wasm-wasi",
+    "build:static": "npm run build:static:files && npm run build:static:compat",
+    "build:rollup": "rollup -c rollup.config.mjs",
+    "build": "npm run build:deps && npm run build:static && npm run build:rollup && ../ruby-wasm-wasi/tools/post-build.sh ./dist"
+  },
+  "repository": "https://github.com/ruby/ruby.wasm",
+  "homepage": "https://github.com/ruby/ruby.wasm/tree/main/packages/npm-packages/ruby-4.0-wasm-wasi",
+  "publishConfig": {
+    "access": "public"
+  },
+  "keywords": [
+    "wasm",
+    "webassembly",
+    "wasi",
+    "ruby"
+  ],
+  "license": "MIT",
+  "dependencies": {
+    "@ruby/wasm-wasi": "^2.0.0"
+  }
+}
diff --git a/packages/npm-packages/ruby-4.0-wasm-wasi/rollup.config.mjs b/packages/npm-packages/ruby-4.0-wasm-wasi/rollup.config.mjs
new file mode 100644
index 000000000..302c2c672
--- /dev/null
+++ b/packages/npm-packages/ruby-4.0-wasm-wasi/rollup.config.mjs
@@ -0,0 +1,21 @@
+import json from "@rollup/plugin-json";
+import { nodeResolve } from "@rollup/plugin-node-resolve";
+import fs from "fs";
+import path from "path";
+
+/** @type {import('rollup').RollupOptions[]} */
+export default [
+  {
+    input: "src/browser.script.js",
+    output: [
+      {
+        file: "dist/browser.script.iife.js",
+        format: "iife",
+        banner: "/* " + fs.readFileSync(path.resolve("../../../NOTICE"), "utf8") + "*/",
+      }
+    ],
+    plugins: [
+      json(), nodeResolve()
+    ],
+  },
+];
diff --git a/packages/npm-packages/ruby-4.0-wasm-wasi/src/browser.script.js b/packages/npm-packages/ruby-4.0-wasm-wasi/src/browser.script.js
new file mode 100644
index 000000000..859006ec7
--- /dev/null
+++ b/packages/npm-packages/ruby-4.0-wasm-wasi/src/browser.script.js
@@ -0,0 +1,5 @@
+
+import { main } from "@ruby/wasm-wasi/dist/browser.script"
+import * as pkg from "../package.json"
+
+main(pkg)
diff --git a/packages/npm-packages/ruby-wasm-wasi/README.md b/packages/npm-packages/ruby-wasm-wasi/README.md
index 3d64d6c9e..08ed63848 100644
--- a/packages/npm-packages/ruby-wasm-wasi/README.md
+++ b/packages/npm-packages/ruby-wasm-wasi/README.md
@@ -11,6 +11,7 @@ See [Cheat Sheet](https://github.com/ruby/ruby.wasm/blob/main/docs/cheat_sheet.m
 | Version | Package                                                                                                         |
 | ------- | --------------------------------------------------------------------------------------------------------------- |
 | `head`  | [`@ruby/head-wasm-wasi`](https://github.com/ruby/ruby.wasm/tree/main/packages/npm-packages/ruby-head-wasm-wasi) |
+| `4.0`   | [`@ruby/4.0-wasm-wasi`](https://github.com/ruby/ruby.wasm/tree/main/packages/npm-packages/ruby-4.0-wasm-wasi)   |
 | `3.4`   | [`@ruby/3.4-wasm-wasi`](https://github.com/ruby/ruby.wasm/tree/main/packages/npm-packages/ruby-3.4-wasm-wasi)   |
 | `3.3`   | [`@ruby/3.3-wasm-wasi`](https://github.com/ruby/ruby.wasm/tree/main/packages/npm-packages/ruby-3.3-wasm-wasi)   |
 | `3.2`   | [`@ruby/3.2-wasm-wasi`](https://github.com/ruby/ruby.wasm/tree/main/packages/npm-packages/ruby-3.2-wasm-wasi)   |
