diff --git a/projects/dovecot/Dockerfile b/projects/dovecot/Dockerfile
new file mode 100755
index 000000000..65393c4e4
--- /dev/null
+++ b/projects/dovecot/Dockerfile
@@ -0,0 +1,24 @@
+# Copyright 2020 Google Inc.
+#
+# 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
+MAINTAINER david@adalogics.com
+RUN apt-get update && apt-get install -y make autoconf automake libtool wget gettext automake libxml2-dev m4 pkg-config
+RUN git clone --depth 1 --single-branch --branch fuzzer https://github.com/dovecot/core dovecot
+WORKDIR dovecot
+COPY build.sh $SRC/
+#COPY fuzz-* $SRC/
+
diff --git a/projects/dovecot/build.sh b/projects/dovecot/build.sh
new file mode 100755
index 000000000..bed21c606
--- /dev/null
+++ b/projects/dovecot/build.sh
@@ -0,0 +1,22 @@
+#!/bin/bash -eu
+# Copyright 2020 Google Inc.
+#
+# 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.
+#
+################################################################################
+./autogen.sh
+./configure PANDOC=false --with-fuzzer=clang
+make
+
+# Copy over the fuzzers
+find . -name "fuzz-*" -executable -exec cp {} $OUT/ \;
diff --git a/projects/dovecot/project.yaml b/projects/dovecot/project.yaml
new file mode 100755
index 000000000..073f7dad8
--- /dev/null
+++ b/projects/dovecot/project.yaml
@@ -0,0 +1,6 @@
+homepage: "https://www.dovecot.org/"
+language: c
+primary_contact: "oss-fuzz@open-xchange.com"
+auto_ccs:
+    - "david@adalogics.com"
+    - "p.antoine@catenacyber.fr"