diff --git a/projects/joni/AddrListFixFuzzer.java b/projects/joni/AddrListFixFuzzer.java
new file mode 100644
index 000000000000..247cac4f2db8
--- /dev/null
+++ b/projects/joni/AddrListFixFuzzer.java
@@ -0,0 +1,35 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+///////////////////////////////////////////////////////////////////////////
+import com.code_intelligence.jazzer.api.FuzzedDataProvider;
+import org.joni.Regex;
+import org.joni.Syntax;
+import org.joni.UnsetAddrList;
+import org.joni.exception.SyntaxException;
+
+// Generated with https://github.com/ossf/fuzz-introspector/tree/main/tools/auto-fuzz
+// Minor modifications to beautify code and ensure exception is caught.
+// jvm-autofuzz-heuristics-2
+// Heuristic name: jvm-autofuzz-heuristics-2
+// Target method: [org.joni.UnsetAddrList] public void fix(org.joni.Regex)
+public class AddrListFixFuzzer {
+  public static void fuzzerTestOneInput(FuzzedDataProvider data) {
+    UnsetAddrList obj = new UnsetAddrList(data.consumeInt(0, 1000));
+    try {
+      obj.fix(new Regex(data.consumeRemainingAsString()));
+    } catch (SyntaxException e) {
+    }
+  }
+}
diff --git a/projects/joni/Dockerfile b/projects/joni/Dockerfile
new file mode 100644
index 000000000000..abd81950b686
--- /dev/null
+++ b/projects/joni/Dockerfile
@@ -0,0 +1,24 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+##########################################################################
+FROM gcr.io/oss-fuzz-base/base-builder-jvm
+RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip \
+      -o maven.zip && \
+      unzip maven.zip -d $SRC/maven && \
+      rm maven.zip
+ENV MVN $SRC/maven/apache-maven-3.6.3/bin/mvn
+RUN git clone --depth 1 https://github.com/jruby/joni joni
+COPY *.sh *.java $SRC/
+WORKDIR $SRC/joni
diff --git a/projects/joni/RegexMatcherFuzzer.java b/projects/joni/RegexMatcherFuzzer.java
new file mode 100644
index 000000000000..192dcde4caf9
--- /dev/null
+++ b/projects/joni/RegexMatcherFuzzer.java
@@ -0,0 +1,37 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+///////////////////////////////////////////////////////////////////////////
+import com.code_intelligence.jazzer.api.FuzzedDataProvider;
+import org.joni.Matcher;
+import org.joni.Regex;
+import org.joni.Syntax;
+import org.joni.exception.SyntaxException;
+
+// Generated with https://github.com/ossf/fuzz-introspector/tree/main/tools/auto-fuzz
+// Minor modifications to beautify code and ensure exception is caught.
+// jvm-autofuzz-heuristics-2
+// Heuristic name: jvm-autofuzz-heuristics-2
+// Target method: [org.joni.Regex] public org.joni.Matcher matcher(byte[],int,int)
+public class RegexMatcherFuzzer {
+  public static void fuzzerTestOneInput(FuzzedDataProvider data) {
+    try {
+      Integer int1 = data.consumeInt();
+      Integer int2 = data.consumeInt();
+      Regex obj = new Regex(data.consumeString(data.remainingBytes() / 2));
+      obj.matcher(data.consumeRemainingAsBytes(), int1, int2);
+    } catch (SyntaxException e) {
+    }
+  }
+}
diff --git a/projects/joni/build.sh b/projects/joni/build.sh
new file mode 100644
index 000000000000..3af8227b66e1
--- /dev/null
+++ b/projects/joni/build.sh
@@ -0,0 +1,69 @@
+#!/bin/bash -eu
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+##########################################################################
+
+$MVN clean package -Dmaven.javadoc.skip=true -DskipTests=true -Dpmd.skip=true \
+    -Dencoding=UTF-8 -Dmaven.antrun.skip=true -Dcheckstyle.skip=true \
+    -Denforcer.fail=false dependency:copy-dependencies
+
+JARFILE_LIST=
+for JARFILE in $(find ./target  -name *.jar)
+do
+  cp $JARFILE $OUT/
+  JARFILE_LIST="$JARFILE_LIST$(basename $JARFILE) "
+done
+
+curr_dir=$PWD
+rm -rf $OUT/jar_temp
+mkdir $OUT/jar_temp
+cd $OUT/jar_temp
+for JARFILE in $JARFILE_LIST
+do
+  jar -xf $OUT/$JARFILE
+done
+cd $curr_dir
+
+BUILD_CLASSPATH=$JAZZER_API_PATH:$OUT/jar_temp
+RUNTIME_CLASSPATH=\$this_dir/jar_temp:\$this_dir
+
+for fuzzer in $(find $SRC -name '*Fuzzer.java')
+do
+  fuzzer_basename=$(basename -s .java $fuzzer)
+  javac -cp $BUILD_CLASSPATH $fuzzer
+  cp $SRC/$fuzzer_basename.class $OUT/
+
+  # Create an execution wrapper that executes Jazzer with the correct arguments.
+  echo "#!/bin/bash
+
+# LLVMFuzzerTestOneInput for fuzzer detection.
+this_dir=\$(dirname "\$0")
+if [[ "\$@" =~ (^| )-runs=[0-9]+($| ) ]]
+then
+mem_settings='-Xmx1900m:-Xss900k'
+else
+mem_settings='-Xmx2048m:-Xss1024k'
+fi
+
+LD_LIBRARY_PATH="$JVM_LD_LIBRARY_PATH":\$this_dir         \
+  \$this_dir/jazzer_driver                                \
+  --agent_path=\$this_dir/jazzer_agent_deploy.jar         \
+  --cp=$RUNTIME_CLASSPATH                                 \
+  --target_class=$fuzzer_basename                         \
+  --jvm_args="\$mem_settings"                             \
+  \$@" > $OUT/$fuzzer_basename
+
+  chmod u+x $OUT/$fuzzer_basename
+done
diff --git a/projects/joni/project.yaml b/projects/joni/project.yaml
new file mode 100644
index 000000000000..bec944262caf
--- /dev/null
+++ b/projects/joni/project.yaml
@@ -0,0 +1,11 @@
+homepage: https://github.com/jruby/joni
+main_repo: https://github.com/jruby/joni
+language: jvm
+fuzzing_engines:
+- libfuzzer
+sanitizers:
+- address
+vendor_ccs:
+- david@adalogics.com
+- adam@adalogics.com
+- arthur.chan@adalogics.com