diff --git a/projects/autoflake/Dockerfile b/projects/autoflake/Dockerfile
new file mode 100644
index 000000000..5453ef68d
--- /dev/null
+++ b/projects/autoflake/Dockerfile
@@ -0,0 +1,20 @@
+# 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-python
+RUN pip3 install --upgrade pip
+RUN git clone https://www.github.com/PyCQA/autoflake autoflake
+COPY *.sh *py $SRC/
+WORKDIR $SRC/autoflake
diff --git a/projects/autoflake/build.sh b/projects/autoflake/build.sh
new file mode 100644
index 000000000..96d53602b
--- /dev/null
+++ b/projects/autoflake/build.sh
@@ -0,0 +1,21 @@
+#!/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.
+#
+##########################################################################
+pip3 install .
+# Build fuzzers in $OUT.
+for fuzzer in $(find $SRC -name 'fuzz_*.py'); do
+  compile_python_fuzzer $fuzzer
+done
diff --git a/projects/autoflake/fuzz_fix_code.py b/projects/autoflake/fuzz_fix_code.py
new file mode 100644
index 000000000..98ab15e03
--- /dev/null
+++ b/projects/autoflake/fuzz_fix_code.py
@@ -0,0 +1,38 @@
+#!/usr/bin/python3
+
+# 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 sys
+import atheris
+# Auto-fuzz heuristics used: py-autofuzz-heuristics-1
+# Imports by the generated code
+import autoflake
+
+
+def TestOneInput(data):
+  fdp = atheris.FuzzedDataProvider(data)
+  source_code = fdp.ConsumeUnicodeNoSurrogates(fdp.ConsumeIntInRange(0, 4096))
+  autoflake.fix_code(source_code)
+
+
+def main():
+  atheris.instrument_all()
+  atheris.Setup(sys.argv, TestOneInput)
+  atheris.Fuzz()
+
+
+if __name__ == "__main__":
+  main()
diff --git a/projects/autoflake/project.yaml b/projects/autoflake/project.yaml
new file mode 100644
index 000000000..01bdca59b
--- /dev/null
+++ b/projects/autoflake/project.yaml
@@ -0,0 +1,9 @@
+homepage: https://www.github.com/PyCQA/autoflake
+main_repo: https://www.github.com/PyCQA/autoflake
+language: python
+fuzzing_engines:
+- libfuzzer
+sanitizers:
+- address
+vendor_ccs:
+- david@adalogics.com