diff --git a/configure.ac b/configure.ac
index ac0963bb..6328932d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,6 +98,40 @@ AC_SUBST(JPEG_INCLUDES)
 CPPFLAGS=$SAVED_CPPFLAGS
 LIBS=$SAVED_LIBS
 
+dnl === check for TIFF support ===
+
+TIFF_INCLUDES=""
+TIFF_LIBS=""
+AC_ARG_WITH([tiffincludedir],
+            [AS_HELP_STRING([--with-tiffincludedir=DIR],
+                            [use TIFF includes from DIR])],
+            TIFF_INCLUDES="-I$withval")
+AC_ARG_WITH([tifflibdir],
+            AS_HELP_STRING([--with-tifflibdir=DIR],
+                           [use TIFF libraries from DIR]),
+            [TIFF_LIBS="-L$withval"])
+
+SAVED_CPPFLAGS=$CPPFLAGS
+SAVED_LIBS=$LIBS
+CPPFLAGS="$TIFF_INCLUDES $CPPFLAGS"
+LIBS="$TIFF_LIBS $LIBS"
+
+AC_CHECK_HEADER(tiffio.h,
+  AC_CHECK_LIB(tiff, TIFFGetVersion,
+               [TIFF_LIBS="$TIFF_LIBS -ltiff"
+                TIFF_INCLUDES="$TIFF_INCLUDES -DWEBP_HAVE_TIFF"
+                AC_DEFINE(WEBP_HAVE_TIFF, [1], [Set to 1 if TIFF library is installed])
+               ],
+               AC_MSG_WARN(Optional tiff library not found),
+               [$MATH_LIBS]),
+  AC_MSG_WARN(tiff library not available - no tiffio.h)
+)
+AC_SUBST(TIFF_LIBS)
+AC_SUBST(TIFF_INCLUDES)
+
+CPPFLAGS=$SAVED_CPPFLAGS
+LIBS=$SAVED_LIBS
+
 dnl === check for WIC support ===
 
 if test "$target_os" = "mingw32"; then
diff --git a/examples/Makefile.am b/examples/Makefile.am
index e9959504..e979c10a 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -12,8 +12,10 @@ dwebp_CPPFLAGS = $(AM_CPPFLAGS) $(PNG_INCLUDES) $(JPEG_INCLUDES) $(USE_EXPERIMEN
 dwebp_LDADD = libexampleutil.la ../src/libwebp.la $(PNG_LIBS) $(JPEG_LIBS)
 
 cwebp_SOURCES = cwebp.c stopwatch.h
-cwebp_CPPFLAGS = $(AM_CPPFLAGS) $(PNG_INCLUDES) $(JPEG_INCLUDES) $(USE_EXPERIMENTAL_CODE)
-cwebp_LDADD = ../src/libwebp.la $(PNG_LIBS) $(JPEG_LIBS)
+cwebp_CPPFLAGS  = $(AM_CPPFLAGS)
+cwebp_CPPFLAGS += $(PNG_INCLUDES) $(JPEG_INCLUDES) $(TIFF_INCLUDES)
+cwebp_CPPFLAGS += $(USE_EXPERIMENTAL_CODE)
+cwebp_LDADD = ../src/libwebp.la $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS)
 
 webpmux_SOURCES = webpmux.c
 webpmux_CPPFLAGS = $(AM_CPPFLAGS) $(USE_EXPERIMENTAL_CODE)