diff --git a/projects/wolfssl/Dockerfile b/projects/wolfssl/Dockerfile
index 12742e1a1..adebc4ae0 100644
--- a/projects/wolfssl/Dockerfile
+++ b/projects/wolfssl/Dockerfile
@@ -18,6 +18,9 @@ FROM gcr.io/oss-fuzz-base/base-builder
 
 RUN apt-get update && apt-get install -y make autoconf automake libtool zip
 RUN git clone https://github.com/wolfssl/wolfssl --depth 1 $SRC/wolfssl
+RUN git clone --depth 1 https://github.com/wolfSSL/wolfssh.git
+RUN git clone --depth 1 https://github.com/guidovranken/fuzzing-headers.git
+RUN git clone --depth 1 https://github.com/guidovranken/wolf-ssl-ssh-fuzzers
 RUN git clone https://github.com/wolfssl/oss-fuzz-targets --depth 1 $SRC/fuzz-targets
 
 WORKDIR wolfssl
diff --git a/projects/wolfssl/build.sh b/projects/wolfssl/build.sh
index 16606125d..acf435c66 100755
--- a/projects/wolfssl/build.sh
+++ b/projects/wolfssl/build.sh
@@ -15,6 +15,15 @@
 #
 ################################################################################
 
+if [[ $CFLAGS != *sanitize=dataflow* ]]
+then
+    NEW_SRC=$SRC/wolf-ssl-ssh-fuzzers/oss-fuzz/projects/wolf-ssl-ssh/
+    cp -R $SRC/wolfssl/ $NEW_SRC
+    cp -R $SRC/wolfssh/ $NEW_SRC
+    cp -R $SRC/fuzzing-headers/ $NEW_SRC
+    OSS_FUZZ_BUILD=1 SRC="$NEW_SRC" $NEW_SRC/build.sh
+fi
+
 # target_dir determined by Dockerfile
 target_dir="$SRC/fuzz-targets"
 
diff --git a/projects/wolfssl/project.yaml b/projects/wolfssl/project.yaml
index f691d72f1..bda941e3a 100644
--- a/projects/wolfssl/project.yaml
+++ b/projects/wolfssl/project.yaml
@@ -7,6 +7,7 @@ auto_ccs:
   - "kaleb.himes@gmail.com"
   - "levi@wolfssl.com"
   - "testing@wolfssl.com"
+  - "guidovranken@gmail.com"
 fuzzing_engines:
   - libfuzzer
   - afl