diff --git a/projects/libidn/Dockerfile b/projects/libidn/Dockerfile
new file mode 100644
index 000000000..e3e616fb2
--- /dev/null
+++ b/projects/libidn/Dockerfile
@@ -0,0 +1,33 @@
+# 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 gcr.io/oss-fuzz-base/base-builder
+MAINTAINER rockdaboot@gmail.com
+RUN apt-get update && apt-get install -y \
+ pkg-config \
+ autopoint \
+ autoconf \
+ automake \
+ libtool \
+ libunistring-dev \
+ gtk-doc-tools \
+ gettext gengetopt curl gperf openjdk-8-jdk
+
+RUN git clone --depth=1 https://git.savannah.gnu.org/git/libidn.git
+RUN cd libidn && make CFGFLAGS="--enable-static --disable-doc"
+
+WORKDIR libidn
+COPY build.sh $SRC/
diff --git a/projects/libidn/build.sh b/projects/libidn/build.sh
new file mode 100755
index 000000000..3e95ee71e
--- /dev/null
+++ b/projects/libidn/build.sh
@@ -0,0 +1,40 @@
+#!/bin/bash -eu
+# 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.
+#
+################################################################################
+
+# avoid iconv() memleak on Ubuntu 16.04 image (breaks test suite)
+export ASAN_OPTIONS=detect_leaks=0
+
+./configure --enable-static --disable-doc
+make -j1
+make -j$(nproc) check
+
+cd fuzz
+make oss-fuzz
+find . -name '*_fuzzer.dict' -exec cp -v '{}' $OUT ';'
+find . -name '*_fuzzer.options' -exec cp -v '{}' $OUT ';'
+
+for fuzzer in *_fuzzer; do
+    cp -p "${fuzzer}" "$OUT"
+
+    if [ -f "$SRC/${fuzzer}_seed_corpus.zip" ]; then
+        cp "$SRC/${fuzzer}_seed_corpus.zip" "$OUT/"
+    fi
+
+    if [ -d "${fuzzer}.in/" ]; then
+        zip -rj "$OUT/${fuzzer}_seed_corpus.zip" "${fuzzer}.in/"
+    fi
+done
diff --git a/projects/libidn/project.yaml b/projects/libidn/project.yaml
new file mode 100644
index 000000000..fab0882c8
--- /dev/null
+++ b/projects/libidn/project.yaml
@@ -0,0 +1,5 @@
+homepage: "https://www.gnu.org/software/libidn/"
+primary_contact: "rockdaboot@gmail.com"
+auto_ccs:
+  - "tim.ruehsen@gmx.de"
+  - "simon@josefsson.org"