diff --git a/projects/apache-commons-collections/CollectionsBidiMapFuzzer.java b/projects/apache-commons-collections/CollectionsBidiMapFuzzer.java
new file mode 100644
index 000000000..03ba972d6
--- /dev/null
+++ b/projects/apache-commons-collections/CollectionsBidiMapFuzzer.java
@@ -0,0 +1,61 @@
+// 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.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+import com.code_intelligence.jazzer.api.FuzzedDataProvider;
+
+import org.apache.commons.collections4.BidiMap;
+import org.apache.commons.collections4.bidimap.TreeBidiMap;
+
+public class CollectionsBidiMapFuzzer {
+
+	BidiMap m_bidiMap = null;
+
+	public CollectionsBidiMapFuzzer(FuzzedDataProvider data) {
+		m_bidiMap = new TreeBidiMap();
+	}
+	
+	void runTest(FuzzedDataProvider data) {
+		switch(data.consumeInt(1, 5)) {
+			case 1:
+				try {
+					m_bidiMap.put(data.consumeString(10), data.consumeString(10));
+				} catch(IllegalArgumentException ex) {
+					/* documented, ignore */
+				}
+				break;
+			case 2:
+				m_bidiMap.get(data.consumeString(10));
+				break;
+			case 3:
+				m_bidiMap.getKey(data.consumeString(10));
+				break;
+			case 4:
+				try {
+					m_bidiMap.removeValue(data.consumeString(10));
+				} catch(UnsupportedOperationException ex) {
+					/* documented, ignore */
+				}
+				break;
+			case 5:
+				m_bidiMap.inverseBidiMap();
+		}
+	}
+
+	public static void fuzzerTestOneInput(FuzzedDataProvider data) {
+		CollectionsBidiMapFuzzer testClosure = new CollectionsBidiMapFuzzer(data);
+		testClosure.runTest(data);
+	}
+}
diff --git a/projects/apache-commons-collections/Dockerfile b/projects/apache-commons-collections/Dockerfile
new file mode 100644
index 000000000..2f92117f1
--- /dev/null
+++ b/projects/apache-commons-collections/Dockerfile
@@ -0,0 +1,29 @@
+# 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 && \
+rm -rf maven.zip
+
+ENV MVN $SRC/maven/apache-maven-3.6.3/bin/mvn
+
+RUN git clone https://github.com/apache/commons-collections
+
+COPY build.sh $SRC/
+COPY *.java $SRC/
+WORKDIR $SRC/commons-collections
\ No newline at end of file
diff --git a/projects/apache-commons-collections/build.sh b/projects/apache-commons-collections/build.sh
new file mode 100644
index 000000000..78066df2d
--- /dev/null
+++ b/projects/apache-commons-collections/build.sh
@@ -0,0 +1,56 @@
+#!/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.
+#
+################################################################################
+
+
+MAVEN_ARGS="-Djavac.src.version=15 -Djavac.target.version=15 -DskipTests -Drat.ignoreErrors=true"
+
+ALL_JARS=""
+
+pushd "${SRC}/commons-collections"
+	$MVN package $MAVEN_ARGS
+	CURRENT_VERSION=$($MVN org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate \
+		-Dexpression=project.version -q -DforceStdout)
+	cp -v target/commons-collections4-${CURRENT_VERSION}.jar "$OUT/commons-collections4.jar"
+	ALL_JARS="${ALL_JARS} commons-collections4.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
+
+# compile all java files and copy them to $OUT
+javac -cp $SRC:$BUILD_CLASSPATH -g $SRC/*.java
+cp $SRC/*.class $OUT/
+
+for fuzzer in $(find $SRC -name '*Fuzzer.java'); do
+  fuzzer_basename=$(basename -s .java $fuzzer)
+
+  # Create an execution wrapper that executes Jazzer with the correct arguments.
+  echo "#!/bin/sh
+# LLVMFuzzerTestOneInput for fuzzer detection.
+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_basename \
+--jvm_args=\"-Xmx2048m\" \
+\$@" > $OUT/$fuzzer_basename
+  chmod u+x $OUT/$fuzzer_basename
+done
\ No newline at end of file
diff --git a/projects/apache-commons-collections/project.yaml b/projects/apache-commons-collections/project.yaml
new file mode 100644
index 000000000..fd3ef5e5c
--- /dev/null
+++ b/projects/apache-commons-collections/project.yaml
@@ -0,0 +1,14 @@
+fuzzing_engines:
+- libfuzzer
+homepage: https://commons.apache.org/proper/commons-collections/
+language: jvm
+main_repo: https://gitbox.apache.org/repos/asf/commons-codellections.git
+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"
\ No newline at end of file