diff --git a/Makefile.am b/Makefile.am
index d1c587fc..ce9964c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ lib_LTLIBRARIES = src/libopenslide.la
 
 src_libopenslide_la_LIBADD = $(GLIB2_LIBS) $(CAIRO_LIBS) $(SQLITE3_LIBS) \
 	$(LIBXML2_LIBS) $(OPENJPEG_LIBS) $(LIBTIFF_LIBS) $(LIBPNG_LIBS) \
-	$(GDKPIXBUF_LIBS) $(ZLIB_LIBS)
+	$(LIBJPEG_LIBS) $(GDKPIXBUF_LIBS) $(ZLIB_LIBS)
 
 src_libopenslide_la_SOURCES = \
 	src/openslide.c \
diff --git a/configure.ac b/configure.ac
index 5415d380..55d0faa5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,14 +51,18 @@ AC_SUBST([SUFFIXED_VERSION])
 
 # libraries
 AC_SEARCH_LIBS([floor], [m],, AC_MSG_FAILURE([cannot find math library]))
-AC_SEARCH_LIBS([jpeg_CreateDecompress], [jpeg],,
-					 AC_MSG_FAILURE([cannot find libjpeg]))
 
 PKG_CHECK_MODULES(ZLIB, [zlib], [], [
   dnl for Ubuntu Lucid, BSD
   AC_SEARCH_LIBS([inflate], [z],, AC_MSG_FAILURE([cannot find zlib]))
 ])
 
+PKG_CHECK_MODULES(LIBJPEG, [libjpeg], [], [
+  dnl IJG libjpeg, or libjpeg-turbo < 1.5.0
+  AC_SEARCH_LIBS([jpeg_CreateDecompress], [jpeg],,
+                 AC_MSG_FAILURE([cannot find libjpeg]))
+])
+
 PKG_CHECK_MODULES(OPENJPEG2, [libopenjp2 >= 2.1.0], [
    AC_DEFINE([HAVE_OPENJPEG2], [1], [Define to 1 if you have OpenJPEG >= 2.1.0.])
    OPENJPEG_CFLAGS="$OPENJPEG2_CFLAGS"