diff --git a/ChangeLog b/ChangeLog
index ba450f01d1..8fedd30fd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-06  Sven Neumann  <sven@gimp.org>
+
+	* configure.in
+	* plug-ins/Makefile.am: fixed --without-jpeg configure option
+	(bug #507572).
+
 2008-01-06  Michael Natterer  <mitch@gimp.org>
 
 	* app/gegl/gimpoperationtilesource.c
diff --git a/configure.in b/configure.in
index 62d86a5a39..c8accd7185 100644
--- a/configure.in
+++ b/configure.in
@@ -982,6 +982,8 @@ AC_SUBST(LIBTIFF)
 # Check for libjpeg
 ###################
 
+jpeg_ok=no
+
 AC_ARG_WITH(libjpeg,  [  --without-libjpeg       build without JPEG support])
   if test "x$with_libjpeg" != xno && test -z "$LIBJPEG"; then
     AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
@@ -1016,9 +1018,10 @@ AC_ARG_WITH(libjpeg,  [  --without-libjpeg       build without JPEG support])
 *** --without-libjpeg to configure but you won't be able to use JPEGs then.])
   fi
 
-AC_SUBST(JPEG)
+AM_CONDITIONAL(BUILD_JPEG, test "x$jpeg_ok" = xyes)
 AC_SUBST(LIBJPEG)
 
+
 ## xjt does build, but it is more confusing than useful on Win32,
 ## as it wants to run tar, mv and bzip2, which seldom are available
 AM_CONDITIONAL(BUILD_XJT, test "x$jpeg_ok" = xyes && test "x$os_win32" = xno)
diff --git a/plug-ins/Makefile.am b/plug-ins/Makefile.am
index 9cf867ce0d..4e0c7506f9 100644
--- a/plug-ins/Makefile.am
+++ b/plug-ins/Makefile.am
@@ -8,6 +8,10 @@ if BUILD_HELPBROWSER
 helpbrowser = helpbrowser
 endif
 
+if BUILD_JPEG
+jpeg = jpeg
+endif
+
 if BUILD_PRINT
 print = print
 endif
@@ -60,7 +64,7 @@ SUBDIRS = \
 	$(helpbrowser)		\
 	ifscompose		\
 	imagemap		\
-	jpeg                    \
+	$(jpeg)                 \
 	maze			\
 	metadata		\
 	pagecurl		\