diff --git a/projects/argcomplete/Dockerfile b/projects/argcomplete/Dockerfile
new file mode 100644
index 000000000..b4b20d316
--- /dev/null
+++ b/projects/argcomplete/Dockerfile
@@ -0,0 +1,19 @@
+#!/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.
+FROM gcr.io/oss-fuzz-base/base-builder-python
+RUN pip3 install --upgrade pip
+RUN git clone https://github.com/kislyuk/argcomplete argcomplete
+COPY *.sh *py $SRC/
+WORKDIR $SRC/argcomplete
diff --git a/projects/argcomplete/build.sh b/projects/argcomplete/build.sh
new file mode 100644
index 000000000..dd11fafc6
--- /dev/null
+++ b/projects/argcomplete/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/argcomplete/fuzz_shlex.py b/projects/argcomplete/fuzz_shlex.py
new file mode 100644
index 000000000..969901e0e
--- /dev/null
+++ b/projects/argcomplete/fuzz_shlex.py
@@ -0,0 +1,36 @@
+#!/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.
+"""Targets the lexical routines used by argcomplete."""
+import sys
+import atheris
+import argcomplete
+
+
+def TestOneInput(data):
+  fdp = atheris.FuzzedDataProvider(data)
+  try:
+    argcomplete.split_line(fdp.ConsumeUnicodeNoSurrogates(sys.maxsize))
+  except (argcomplete.ArgcompleteException):
+    pass
+
+
+def main():
+  atheris.instrument_all()
+  atheris.Setup(sys.argv, TestOneInput)
+  atheris.Fuzz()
+
+
+if __name__ == "__main__":
+  main()
diff --git a/projects/argcomplete/project.yaml b/projects/argcomplete/project.yaml
new file mode 100644
index 000000000..506ef42b2
--- /dev/null
+++ b/projects/argcomplete/project.yaml
@@ -0,0 +1,10 @@
+homepage: https://github.com/kislyuk/argcomplete
+main_repo: https://github.com/kislyuk/argcomplete
+language: python
+fuzzing_engines:
+- libfuzzer
+sanitizers:
+- address
+- undefined
+vendor_ccs:
+- david@adalogics.com