diff --git a/projects/librevenge/Dockerfile b/projects/dlplibs/Dockerfile
similarity index 71%
rename from projects/librevenge/Dockerfile
rename to projects/dlplibs/Dockerfile
index 72667ef10..0c128eab1 100644
--- a/projects/librevenge/Dockerfile
+++ b/projects/dlplibs/Dockerfile
@@ -16,12 +16,16 @@
 
 FROM gcr.io/oss-fuzz-base/base-builder
 MAINTAINER dtardon@redhat.com
-#build requirements
+# install build requirements
 RUN apt-get update
-RUN apt-get build-dep -y librevenge
-ADD https://dev-www.libreoffice.org/corpus/olefuzzer_seed_corpus.zip $SRC/
-ADD https://dev-www.libreoffice.org/corpus/zipfuzzer_seed_corpus.zip $SRC/
-#clone source
+RUN apt-get build-dep -y libmspub librevenge
+# download fuzzing corpora
+ADD https://dev-www.libreoffice.org/corpus/olefuzzer_seed_corpus.zip \
+    https://dev-www.libreoffice.org/corpus/pubfuzzer_seed_corpus.zip \
+    https://dev-www.libreoffice.org/corpus/zipfuzzer_seed_corpus.zip \
+    $SRC/
+# clone sources
 RUN git clone --depth 1 git://git.code.sf.net/p/libwpd/librevenge
-WORKDIR librevenge
+RUN git clone --depth 1 git://gerrit.libreoffice.org/libmspub
+WORKDIR $SRC
 COPY build.sh $SRC/
diff --git a/projects/libmspub/build.sh b/projects/dlplibs/build.sh
similarity index 93%
rename from projects/libmspub/build.sh
rename to projects/dlplibs/build.sh
index a5ecbfe29..545721118 100755
--- a/projects/libmspub/build.sh
+++ b/projects/dlplibs/build.sh
@@ -22,12 +22,13 @@ iculib=$(pwd)/icu
 
 pushd librevenge
 ./autogen.sh
-./configure --without-docs --disable-shared --enable-static --disable-tests
+./configure --without-docs --disable-shared --enable-static --disable-tests --enable-fuzzers
 make -j$(nproc)
 rvnginc=$(pwd)/inc
 rvnglib=$(pwd)/src/lib
 popd
 
+pushd libmspub
 ./autogen.sh
 ./configure --without-docs --disable-shared --enable-static --disable-tools --enable-fuzzers \
     ICU_CFLAGS="$(pkg-config --cflags icu-i18n)" \
@@ -36,6 +37,7 @@ popd
     REVENGE_STREAM_CFLAGS=-I$rvnginc REVENGE_STREAM_LIBS="-L$rvnglib -lrevenge-stream-0.0" \
     REVENGE_GENERATORS_CFLAGS=-I$rvnginc REVENGE_GENERATORS_LIBS="-L$rvnglib -lrevenge-generators-0.0"
 make -j$(nproc)
+popd
 
-cp src/fuzz/*fuzzer $OUT
-cp $SRC/*_seed_corpus.zip $OUT
+cp */src/fuzz/*fuzzer $OUT
+cp *_seed_corpus.zip $OUT
diff --git a/projects/dlplibs/project.yaml b/projects/dlplibs/project.yaml
new file mode 100644
index 000000000..80bc9e58e
--- /dev/null
+++ b/projects/dlplibs/project.yaml
@@ -0,0 +1,2 @@
+homepage: "https://www.documentliberation.org"
+primary_contact: "dtardon@redhat.com"
diff --git a/projects/libmspub/Dockerfile b/projects/libmspub/Dockerfile
deleted file mode 100644
index a03695921..000000000
--- a/projects/libmspub/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2017 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 dtardon@redhat.com
-#build requirements
-RUN apt-get update
-RUN apt-get build-dep -y libmspub
-ADD https://dev-www.libreoffice.org/corpus/pubfuzzer_seed_corpus.zip $SRC/
-#clone source
-RUN git clone --depth 1 git://gerrit.libreoffice.org/libmspub
-RUN git clone --depth 1 git://git.code.sf.net/p/libwpd/librevenge libmspub/librevenge
-WORKDIR libmspub
-COPY build.sh $SRC/
diff --git a/projects/libmspub/project.yaml b/projects/libmspub/project.yaml
deleted file mode 100644
index 3e9281e42..000000000
--- a/projects/libmspub/project.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-homepage: "https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
-primary_contact: "dtardon@redhat.com"
diff --git a/projects/librevenge/build.sh b/projects/librevenge/build.sh
deleted file mode 100755
index 7bb1cbcce..000000000
--- a/projects/librevenge/build.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash -eu
-# Copyright 2017 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 --without-docs --disable-shared --enable-static --disable-tests --disable-generators --enable-fuzzers
-make -j$(nproc)
-
-cp src/fuzz/*fuzzer $OUT
-cp $SRC/*_seed_corpus.zip $OUT
diff --git a/projects/librevenge/project.yaml b/projects/librevenge/project.yaml
deleted file mode 100644
index 3174b4bee..000000000
--- a/projects/librevenge/project.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-homepage: "https://sourceforge.net/p/libwpd/wiki/librevenge/"
-primary_contact: "dtardon@redhat.com"