diff --git a/.changeset/solid-donkeys-pump.md b/.changeset/solid-donkeys-pump.md
new file mode 100644
index 0000000..d5a0f50
--- /dev/null
+++ b/.changeset/solid-donkeys-pump.md
@@ -0,0 +1,5 @@
+---
+"@ast-grep/lang-java": patch
+---
+
+Add @ast-grep/lang-java
diff --git a/packages/java/README.md b/packages/java/README.md
new file mode 100644
index 0000000..f0f4b4a
--- /dev/null
+++ b/packages/java/README.md
@@ -0,0 +1,24 @@
+# ast-grep napi language for java
+
+## Installation
+
+In a pnpm project, run:
+
+```bash
+pnpm install @ast-grep/lang-java
+pnpm install @ast-grep/napi
+# install the tree-sitter-cli if no prebuild is available
+pnpm install @tree-sitter/cli --save-dev
+```
+
+## Usage
+
+```js
+import java from '@ast-grep/lang-java'
+import { registerDynamicLanguage, parse } from '@ast-grep/napi'
+
+registerDynamicLanguage({ java })
+
+const sg = parse('java', `your code`)
+sg.root().kind()
+```
diff --git a/packages/java/index.d.ts b/packages/java/index.d.ts
new file mode 100644
index 0000000..11140a6
--- /dev/null
+++ b/packages/java/index.d.ts
@@ -0,0 +1,10 @@
+type LanguageRegistration = {
+  libraryPath: string
+  extensions: string[]
+  languageSymbol?: string
+  metaVarChar?: string
+  expandoChar?: string
+}
+
+declare const registration: LanguageRegistration
+export default registration
diff --git a/packages/java/index.js b/packages/java/index.js
new file mode 100644
index 0000000..3455a22
--- /dev/null
+++ b/packages/java/index.js
@@ -0,0 +1,9 @@
+const path = require('node:path')
+const libPath = path.join(__dirname, 'parser.so')
+
+module.exports = {
+  libraryPath: libPath,
+  extensions: ['java'],
+  languageSymbol: 'tree_sitter_java',
+  expandoChar: '$',
+}
diff --git a/packages/java/nursery.js b/packages/java/nursery.js
new file mode 100644
index 0000000..ce236dc
--- /dev/null
+++ b/packages/java/nursery.js
@@ -0,0 +1,16 @@
+const { setup } = require('@ast-grep/nursery')
+const languageRegistration = require('./index')
+const assert = require('node:assert')
+
+setup({
+  dirname: __dirname,
+  name: 'java',
+  treeSitterPackage: 'tree-sitter-java',
+  languageRegistration,
+  testRunner: parse => {
+    const sg = parse('int a = 123;')
+    const root = sg.root()
+    const node = root.find('int a = 123')
+    assert.equal(node.kind(), 'local_variable_declaration')
+  },
+})
diff --git a/packages/java/package.json b/packages/java/package.json
new file mode 100644
index 0000000..e889509
--- /dev/null
+++ b/packages/java/package.json
@@ -0,0 +1,47 @@
+{
+  "name": "@ast-grep/lang-java",
+  "version": "0.0.1",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "build": "tree-sitter build -o parser.so",
+    "source": "node nursery.js source",
+    "prepublishOnly": "node nursery.js source",
+    "postinstall": "node postinstall.js",
+    "test": "node nursery.js test"
+  },
+  "files": [
+    "index.js",
+    "index.d.ts",
+    "type.d.ts",
+    "postinstall.js",
+    "src",
+    "prebuilds"
+  ],
+  "keywords": ["ast-grep"],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@ast-grep/setup-lang": "0.0.3"
+  },
+  "peerDependencies": {
+    "tree-sitter-cli": "0.24.6"
+  },
+  "peerDependenciesMeta": {
+    "tree-sitter-cli": {
+      "optional": true
+    }
+  },
+  "devDependencies": {
+    "@ast-grep/nursery": "0.0.2",
+    "tree-sitter-cli": "0.24.6",
+    "tree-sitter-java": "0.23.5"
+  },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "pnpm": {
+    "onlyBuiltDependencies": ["@ast-grep/lang-java", "tree-sitter-cli"]
+  }
+}
diff --git a/packages/java/postinstall.js b/packages/java/postinstall.js
new file mode 100644
index 0000000..b9141ff
--- /dev/null
+++ b/packages/java/postinstall.js
@@ -0,0 +1,4 @@
+const { postinstall } = require('@ast-grep/setup-lang')
+postinstall({
+  dirname: __dirname,
+})
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 25a339e..3a1c349 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -162,6 +162,22 @@ importers:
         specifier: 0.23.1
         version: 0.23.1(tree-sitter@0.21.1)
 
+  packages/java:
+    dependencies:
+      '@ast-grep/setup-lang':
+        specifier: 0.0.3
+        version: 0.0.3
+    devDependencies:
+      '@ast-grep/nursery':
+        specifier: 0.0.2
+        version: 0.0.2
+      tree-sitter-cli:
+        specifier: 0.24.6
+        version: 0.24.6
+      tree-sitter-java:
+        specifier: 0.23.5
+        version: 0.23.5(tree-sitter@0.21.1)
+
   packages/python:
     dependencies:
       '@ast-grep/setup-lang':
@@ -929,6 +945,14 @@ packages:
       tree_sitter:
         optional: true
 
+  tree-sitter-java@0.23.5:
+    resolution: {integrity: sha512-Yju7oQ0Xx7GcUT01mUglPP+bYfvqjNCGdxqigTnew9nLGoII42PNVP3bHrYeMxswiCRM0yubWmN5qk+zsg0zMA==}
+    peerDependencies:
+      tree-sitter: ^0.21.1
+    peerDependenciesMeta:
+      tree-sitter:
+        optional: true
+
   tree-sitter-python@0.23.6:
     resolution: {integrity: sha512-yIM9z0oxKIxT7bAtPOhgoVl6gTXlmlIhue7liFT4oBPF/lha7Ha4dQBS82Av6hMMRZoVnFJI8M6mL+SwWoLD3A==}
     peerDependencies:
@@ -1599,6 +1623,13 @@ snapshots:
       node-gyp-build: 4.8.4
       tree-sitter: 0.21.1
 
+  tree-sitter-java@0.23.5(tree-sitter@0.21.1):
+    dependencies:
+      node-addon-api: 8.3.1
+      node-gyp-build: 4.8.4
+    optionalDependencies:
+      tree-sitter: 0.21.1
+
   tree-sitter-python@0.23.6:
     dependencies:
       node-addon-api: 8.3.0