diff --git a/projects/libtheora/Dockerfile b/projects/libtheora/Dockerfile
new file mode 100644
index 000000000..abf8782dd
--- /dev/null
+++ b/projects/libtheora/Dockerfile
@@ -0,0 +1,24 @@
+# Copyright 2019 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 guidovranken@gmail.com
+RUN apt-get update && apt-get install -y make autoconf automake libtool
+RUN git clone --depth 1 https://github.com/xiph/ogg.git
+RUN git clone --depth 1 git://git.xiph.org/theora.git libtheora
+RUN git clone --depth 1 https://github.com/guidovranken/oss-fuzz-fuzzers.git
+RUN git clone --depth 1 https://github.com/guidovranken/fuzzing-headers.git
+COPY build.sh $SRC/
diff --git a/projects/libtheora/build.sh b/projects/libtheora/build.sh
new file mode 100755
index 000000000..1c8dea74f
--- /dev/null
+++ b/projects/libtheora/build.sh
@@ -0,0 +1,52 @@
+#!/bin/bash -eu
+# Copyright 2019 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.
+#
+################################################################################
+
+if [[ $CFLAGS = *sanitize=address* ]]
+then
+    export CXXFLAGS="$CXXFLAGS -DASAN"
+fi
+
+if [[ $CFLAGS = *sanitize=memory* ]]
+then
+    export CXXFLAGS="$CXXFLAGS -DMSAN"
+fi
+
+mkdir $SRC/libogg-install/
+cd $SRC/ogg
+./autogen.sh
+./configure --prefix="$SRC/libogg-install"
+make -j$(nproc)
+make install
+
+cd $SRC/fuzzing-headers/
+./install.sh
+
+cd $SRC/libtheora/
+./autogen.sh
+
+if [[ $CFLAGS = *sanitize=memory* || $CFLAGS = *-m32* ]]
+then
+    LD_LIBRARY_PATH="$SRC/libogg-install/lib" ./configure --with-ogg="$SRC/libogg-install" --disable-encode --disable-examples --disable-asm
+else
+    LD_LIBRARY_PATH="$SRC/libogg-install/lib" ./configure --with-ogg="$SRC/libogg-install" --disable-encode --disable-examples
+fi
+
+make -j$(nproc)
+
+cd $SRC/oss-fuzz-fuzzers/libtheora/
+
+$CXX $CXXFLAGS -I $SRC/libtheora/include/ -I $SRC/libogg-install/include fuzzer.cpp $SRC/libtheora/lib/.libs/libtheora.a $LIB_FUZZING_ENGINE -o $OUT/fuzzer-decoder
diff --git a/projects/libtheora/project.yaml b/projects/libtheora/project.yaml
new file mode 100644
index 000000000..1cf89a88e
--- /dev/null
+++ b/projects/libtheora/project.yaml
@@ -0,0 +1,12 @@
+homepage: "https://www.theora.org/"
+primary_contact: "guidovranken@gmail.com"
+vendor_ccs:
+ - "cdiehl@mozilla.com"
+sanitizers:
+ - address
+ - undefined
+ - memory
+ - dataflow
+architectures:
+ - x86_64
+ - i386