diff --git a/projects/jopt-simple/Dockerfile b/projects/jopt-simple/Dockerfile
new file mode 100644
index 000000000..d4131b2c8
--- /dev/null
+++ b/projects/jopt-simple/Dockerfile
@@ -0,0 +1,33 @@
+# Copyright 2022 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://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip -o maven.zip && \
+unzip maven.zip -d $SRC/maven-3.6.3 && \
+rm -rf maven.zip
+
+ENV MVN $SRC/maven-3.6.3/apache-maven-3.6.3/bin/mvn
+
+WORKDIR ${SRC}
+#
+# clone repository
+#
+RUN git clone "https://github.com/jopt-simple/jopt-simple.git"
+
+ADD pom.xml build.sh ${SRC}/
+ADD src/ ${SRC}/src/
+WORKDIR ${SRC}/jopt-simple
\ No newline at end of file
diff --git a/projects/jopt-simple/build.sh b/projects/jopt-simple/build.sh
new file mode 100644
index 000000000..01e587b33
--- /dev/null
+++ b/projects/jopt-simple/build.sh
@@ -0,0 +1,87 @@
+#!/bin/bash -eu
+# Copyright 2022 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_FLAGS="-DskipTests"
+ALL_JARS=""
+LIBRARY_NAME="jopt-simple"
+
+# Install the build servers' jazzer-api into the maven repository.
+pushd "/tmp"
+	${MVN} install:install-file -Dfile=${JAZZER_API_PATH} \
+		-DgroupId="com.code-intelligence" \
+		-DartifactId="jazzer-api" \
+		-Dversion="0.12.0" \
+		-Dpackaging=jar
+popd
+
+pushd "${SRC}/${LIBRARY_NAME}"
+	${MVN} package ${MVN_FLAGS}
+	CURRENT_VERSION=$(${MVN} org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate \
+  		-Dexpression=project.version -q -DforceStdout)
+	${MVN} ${MVN_FLAGS} install:install-file -Dfile=${SRC}/jopt-simple/net.sf.joptsimple/target/net-sf-joptsimple-${CURRENT_VERSION}.jar \
+		-DgroupId="net.sf.jopt-simple" \
+		-DartifactId="jopt-simple" \
+		-Dversion="${CURRENT_VERSION}" \
+		-Dpackaging=jar
+popd
+
+pushd "${SRC}"
+	${MVN} package -DfuzzedLibaryVersion="${CURRENT_VERSION}" ${MVN_FLAGS}
+	install -v target/${LIBRARY_NAME}-fuzzer-${CURRENT_VERSION}.jar ${OUT}/${LIBRARY_NAME}-fuzzer-${CURRENT_VERSION}.jar
+	ALL_JARS="${ALL_JARS} ${LIBRARY_NAME}-fuzzer-${CURRENT_VERSION}.jar"
+popd
+
+
+
+# The classpath at build-time includes the project jars in $OUT as well as the
+# Jazzer API.
+BUILD_CLASSPATH=$(echo $ALL_JARS | xargs printf -- "$OUT/%s:"):$JAZZER_API_PATH
+
+# All .jar and .class files lie in the same directory as the fuzzer at runtime.
+RUNTIME_CLASSPATH=$(echo $ALL_JARS | xargs printf -- "\$this_dir/%s:"):\$this_dir
+
+MVN_FUZZERS_PREFIX="src/main/java"
+
+for fuzzer in $(find ${SRC} -name '*Fuzzer.java'); do
+	# Find our fuzzer inside the maven structure
+	stripped_path=$(echo ${fuzzer} | sed \
+		-e 's|^.*src/main/java/\(.*\).java$|\1|' \
+		-e 's|^.*src/test/java/\(.*\).java$|\1|' \
+	);
+	# The .java suffix was stripped by sed.
+	if (echo ${stripped_path} | grep ".java$"); then
+		continue;
+	fi
+	
+	fuzzer_basename=$(basename -s .java $fuzzer)
+	fuzzer_classname=$(echo ${stripped_path} | sed 's|/|.|g');
+	
+	# Create an execution wrapper that executes Jazzer with the correct arguments.
+	
+	echo "#!/bin/sh
+# LLVMFuzzerTestOneInput Magic String required for infra/base-images/base-runner/test_all.py. DO NOT REMOVE
+
+
+this_dir=\$(dirname \"\$0\")
+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_classname} \
+--jvm_args=\"-Xmx2048m\" \
+\$@" > $OUT/${fuzzer_basename}
+	chmod u+x $OUT/${fuzzer_basename}
+done
\ No newline at end of file
diff --git a/projects/jopt-simple/pom.xml b/projects/jopt-simple/pom.xml
new file mode 100644
index 000000000..674acef8f
--- /dev/null
+++ b/projects/jopt-simple/pom.xml
@@ -0,0 +1,73 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>ossfuzz</groupId>
+	<artifactId>jopt-simple-fuzzer</artifactId>
+	<version>${fuzzedLibaryVersion}</version>
+	<packaging>jar</packaging>
+	
+	<properties>
+		<maven.compiler.source>15</maven.compiler.source>
+		<maven.compiler.target>15</maven.compiler.target>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<fuzzedLibaryVersion>6.0-alpha-3</fuzzedLibaryVersion>
+		<exec.mainClass>ossfuzz.OptionParserFuzzer</exec.mainClass>
+	</properties>
+
+	<!-- This repositories list is copy pasted from the projects' main BOM -->
+	
+	<dependencies>
+		<!--
+			On the CI, install the jazzer file with
+		
+				mvn install:install-file -Dfile=${JAZZER_API_PATH} \
+					-DgroupId="com.code-intelligence" \
+					-DartifactId="jazzer-api" \
+					-Dversion="0.12.0" \
+					-Dpackaging=jar
+		
+			in order to avoid mismatching driver/api versions.
+		-->
+		<dependency>
+			<groupId>com.code-intelligence</groupId>
+			<artifactId>jazzer-api</artifactId>
+			<version>0.12.0</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.jopt-simple</groupId>
+			<artifactId>jopt-simple</artifactId>
+			<version>${fuzzedLibaryVersion}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>3.3.0</version>
+				<configuration>
+					<filters>
+						<filter>
+							<artifact>*:*</artifact>
+							<excludes>
+								<exclude>META-INF/*.SF</exclude>
+								<exclude>META-INF/*.DSA</exclude>
+								<exclude>META-INF/*.RSA</exclude>
+							</excludes>
+						</filter>
+					</filters>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/projects/jopt-simple/project.yaml b/projects/jopt-simple/project.yaml
new file mode 100644
index 000000000..c1ba3da6f
--- /dev/null
+++ b/projects/jopt-simple/project.yaml
@@ -0,0 +1,15 @@
+homepage: "http://jopt-simple.github.io/jopt-simple/"
+language: jvm
+main_repo: "https://github.com/jopt-simple/jopt-simple.git"
+fuzzing_engines:
+  - libfuzzer
+sanitizers:
+  - address
+vendor_ccs:
+  - "wagner@code-intelligence.com"
+  - "yakdan@code-intelligence.com"
+  - "glendowne@code-intelligence.com"
+  - "patrice.salathe@code-intelligence.com"
+  - "hlin@code-intelligence.com"
+  - "schaich@code-intelligence.com"
+  - "bug-disclosure@code-intelligence.com"
\ No newline at end of file
diff --git a/projects/jopt-simple/src/main/java/ossfuzz/OptionParserFuzzer.java b/projects/jopt-simple/src/main/java/ossfuzz/OptionParserFuzzer.java
new file mode 100644
index 000000000..20e79ef64
--- /dev/null
+++ b/projects/jopt-simple/src/main/java/ossfuzz/OptionParserFuzzer.java
@@ -0,0 +1,65 @@
+// Copyright 2022 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.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+package ossfuzz;
+
+import com.code_intelligence.jazzer.api.FuzzedDataProvider;
+import joptsimple.OptionParser;
+import joptsimple.OptionSet;
+import joptsimple.OptionException;
+import java.util.Date;
+import java.util.ArrayList;
+
+public class OptionParserFuzzer {
+
+	private FuzzedDataProvider fuzzedDataProvider;
+
+	public OptionParserFuzzer(FuzzedDataProvider fuzzedDataProvider) {
+		this.fuzzedDataProvider = fuzzedDataProvider;
+
+	}
+
+	void test() {
+		try {
+			OptionParser parser = new OptionParser();
+			var list = new ArrayList();
+			for (int i = 0; i < fuzzedDataProvider.consumeInt(0, 10); i ++)
+			{
+				list.add(fuzzedDataProvider.consumeString(100));
+			}
+
+			parser.accepts(fuzzedDataProvider.consumeString(100)).withOptionalArg().ofType(Integer.class);
+			parser.accepts(fuzzedDataProvider.consumeString(100)).withOptionalArg().ofType(Boolean.class);
+			parser.accepts(fuzzedDataProvider.consumeString(100)).withOptionalArg().ofType(String.class);
+			parser.accepts(fuzzedDataProvider.consumeString(100)).withOptionalArg().ofType(Float.class);
+			parser.accepts(fuzzedDataProvider.consumeString(100)).withOptionalArg().ofType(Date.class);
+			parser.accepts(fuzzedDataProvider.consumeString(100));
+			parser.acceptsAll(list);
+			parser.parse(fuzzedDataProvider.consumeRemainingAsString());
+		} catch (IllegalArgumentException e) {
+
+		} catch (OptionException e) {
+
+		}
+
+	}
+
+	public static void fuzzerTestOneInput(FuzzedDataProvider fuzzedDataProvider) {
+
+		OptionParserFuzzer fixture = new OptionParserFuzzer(fuzzedDataProvider);
+		fixture.test();
+	}
+}
\ No newline at end of file