diff --git a/projects/commons-net/Base64Fuzzer.java b/projects/commons-net/Base64Fuzzer.java
new file mode 100644
index 000000000..50d177b8e
--- /dev/null
+++ b/projects/commons-net/Base64Fuzzer.java
@@ -0,0 +1,29 @@
+// Copyright 2024 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.net.util.Base64;
+
+public class Base64Fuzzer {
+    public static void fuzzerTestOneInput(FuzzedDataProvider data) {
+        try{
+            Base64 b64 = new Base64(data.consumeInt(), data.consumeBytes(1000), data.consumeBoolean());
+            b64.encode(data.consumeBytes(4000));
+            b64.decode(data.consumeBytes(4000));
+        }
+        catch (java.lang.IllegalArgumentException e) {}
+    } 
+}
\ No newline at end of file
diff --git a/projects/commons-net/Dockerfile b/projects/commons-net/Dockerfile
new file mode 100644
index 000000000..18c6629df
--- /dev/null
+++ b/projects/commons-net/Dockerfile
@@ -0,0 +1,28 @@
+# Copyright 2024 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 apt-get update && apt-get install -y make autoconf automake libtool wget 
+
+RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.8.7/binaries/apache-maven-3.8.7-bin.zip -o maven.zip && \
+    unzip maven.zip -d $SRC/maven && \
+    rm -rf maven.zip
+ENV MVN $SRC/maven/apache-maven-3.8.7/bin/mvn
+
+RUN git clone --depth 1 https://github.com/apache/commons-net.git commons-net
+WORKDIR commons-net
+COPY build.sh $SRC/
+COPY *.java $SRC/
\ No newline at end of file
diff --git a/projects/commons-net/MLSxEntryParserFuzzer.java b/projects/commons-net/MLSxEntryParserFuzzer.java
new file mode 100644
index 000000000..3d5c835dd
--- /dev/null
+++ b/projects/commons-net/MLSxEntryParserFuzzer.java
@@ -0,0 +1,30 @@
+// Copyright 2024 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.net.ftp.parser.*;
+import org.apache.commons.net.ftp.FTPFileEntryParser;
+
+public class MLSxEntryParserFuzzer {
+    public static void fuzzerTestOneInput(FuzzedDataProvider data) {
+        try{
+            FTPFileEntryParser parser = MLSxEntryParser.getInstance();
+            parser.parseFTPEntry(data.consumeRemainingAsString());
+        }
+        catch (java.lang.NumberFormatException e) {}
+        catch (java.lang.StringIndexOutOfBoundsException e) {}
+    } 
+}
\ No newline at end of file
diff --git a/projects/commons-net/NTFTPEntryParserFuzzer.java b/projects/commons-net/NTFTPEntryParserFuzzer.java
new file mode 100644
index 000000000..4e444f980
--- /dev/null
+++ b/projects/commons-net/NTFTPEntryParserFuzzer.java
@@ -0,0 +1,30 @@
+// Copyright 2024 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.net.ftp.FTPFileEntryParser;
+import org.apache.commons.net.ftp.parser.NTFTPEntryParser;
+
+public class NTFTPEntryParserFuzzer {
+  public static void fuzzerTestOneInput(FuzzedDataProvider data) {
+    try{
+      FTPFileEntryParser parser = new NTFTPEntryParser();
+      parser.parseFTPEntry(data.consumeRemainingAsString());
+    }
+    catch (java.lang.NumberFormatException e) {}
+  }
+}
\ No newline at end of file
diff --git a/projects/commons-net/OS400FTPEntryParserFuzzer.java b/projects/commons-net/OS400FTPEntryParserFuzzer.java
new file mode 100644
index 000000000..35850dd0e
--- /dev/null
+++ b/projects/commons-net/OS400FTPEntryParserFuzzer.java
@@ -0,0 +1,26 @@
+// Copyright 2024 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.net.ftp.FTPFileEntryParser;
+import org.apache.commons.net.ftp.parser.OS400FTPEntryParser;
+
+public class OS400FTPEntryParserFuzzer {
+  public static void fuzzerTestOneInput(FuzzedDataProvider data) {
+    FTPFileEntryParser parser = new OS400FTPEntryParser();
+    parser.parseFTPEntry(data.consumeRemainingAsString());
+  }
+}
\ No newline at end of file
diff --git a/projects/commons-net/TelnetOptionFuzzer.java b/projects/commons-net/TelnetOptionFuzzer.java
new file mode 100644
index 000000000..5e94091a3
--- /dev/null
+++ b/projects/commons-net/TelnetOptionFuzzer.java
@@ -0,0 +1,28 @@
+// Copyright 2024 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.net.telnet.TelnetOption;
+
+public class TelnetOptionFuzzer {
+    public static void fuzzerTestOneInput(FuzzedDataProvider data) {
+        try{
+            TelnetOption.getOption(data.consumeInt());
+            TelnetOption.isValidOption(data.consumeInt());
+        }
+        catch (java.lang.ArrayIndexOutOfBoundsException e) {}
+    }
+}
\ No newline at end of file
diff --git a/projects/commons-net/build.sh b/projects/commons-net/build.sh
new file mode 100755
index 000000000..71f37a3fb
--- /dev/null
+++ b/projects/commons-net/build.sh
@@ -0,0 +1,57 @@
+#!/bin/bash -eu
+# Copyright 2024 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="-Dpropguard.skip -DskipTests -Dmaven.javadoc.skip=true -Dpmd.skip=true \
+  -Dencoding=UTF-8 -Dmaven.antrun.skip=true -Dcheckstyle.skip=true \
+  -DperformRelease=True"
+$MVN clean package $MAVEN_ARGS org.apache.maven.plugins:maven-shade-plugin:3.2.4:shade
+CURRENT_VERSION=$($MVN org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate \
+ -Dexpression=project.version -q -DforceStdout)
+find ./ -name "commons-net-$CURRENT_VERSION.jar" -exec mv {} $OUT/commons-net.jar \;
+
+ALL_JARS="commons-net.jar"
+
+# 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
+
+javac -cp $BUILD_CLASSPATH ${SRC}/*.java
+install ${SRC}/*.class ${OUT}/
+
+for fuzzer in $(find $SRC -name '*Fuzzer.java' -maxdepth 1); do
+  fuzzer_basename=$(basename -s .java $fuzzer)
+
+# 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/commons-net/project.yaml b/projects/commons-net/project.yaml
new file mode 100644
index 000000000..961f3185c
--- /dev/null
+++ b/projects/commons-net/project.yaml
@@ -0,0 +1,9 @@
+homepage: "https://github.com/apache/commons-net"
+language: jvm
+primary_contact: "irali@google.com"
+main_repo: "https://github.com/apache/commons-net.git"
+file_github_issue: false
+fuzzing_engines:
+  - libfuzzer
+sanitizers:
+  - address