diff --git a/expat/Dockerfile b/expat/Dockerfile
new file mode 100644
index 000000000..3f06e62b9
--- /dev/null
+++ b/expat/Dockerfile
@@ -0,0 +1,20 @@
+# Copyright 2016 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 libfuzzer/base-fuzzer
+MAINTAINER mike.aizatsky@gmail.com
+
+CMD /workspace/oss-fuzz/expat/build.sh
diff --git a/expat/Jenkinsfile b/expat/Jenkinsfile
new file mode 100644
index 000000000..15b988721
--- /dev/null
+++ b/expat/Jenkinsfile
@@ -0,0 +1,24 @@
+// Copyright 2016 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.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+def libfuzzerBuild = fileLoader.fromGit('infra/libfuzzer-pipeline.groovy',
+        'https://github.com/google/oss-fuzz.git', 'master', null, '')
+
+libfuzzerBuild {
+  git = "git://git.code.sf.net/p/expat/code_git"
+  needsOssFuzz = true
+  dockerfile = "oss-fuzz/expat/Dockerfile"
+}
diff --git a/expat/Readme.md b/expat/Readme.md
new file mode 100644
index 000000000..7985d56f5
--- /dev/null
+++ b/expat/Readme.md
@@ -0,0 +1,4 @@
+Fuzzing expat
+=============
+
+* home page: [http://expat.sourceforge.net/](http://expat.sourceforge.net/)
diff --git a/expat/build.sh b/expat/build.sh
new file mode 100644
index 000000000..5145fbf67
--- /dev/null
+++ b/expat/build.sh
@@ -0,0 +1,8 @@
+#!/bin/bash -ex
+
+echo $pwd
+
+ls -alR
+
+./buildconf.sh
+./configure
diff --git a/infra/README.md b/infra/README.md
index e78d94b94..a519c627a 100644
--- a/infra/README.md
+++ b/infra/README.md
@@ -3,5 +3,7 @@ Infrastructure
 
 This directory contains infrastructure definition for oss-fuzz project:
 
-* `base-images` - docker images used for building fuzzers.
+* `base-images` - docker images for building fuzzers & corresponding jenkins
+  pipeline.
+* `docker-cleanup` - jenkins pipeline to clean stale docker images & processes.
 * `jenkins-cluster` - kubernetes cluster definition for our jenkins-based build.