diff --git a/ChangeLog b/ChangeLog
index f56089da0..9556f59a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Sep  4 12:53:44 EEST 2008 (edwin)
+-------------------------------------
+ * configure: fix bzip2 cve test link problems (bb #1158)
+
 Tue Sep  2 15:11:53 CEST 2008 (tk)
 ----------------------------------
   * V 0.94
diff --git a/configure b/configure
index 5d3dd119b..2991e4dfb 100755
--- a/configure
+++ b/configure
@@ -14806,8 +14806,8 @@ if test "${ac_cv_c_cve_2008_1372+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LIBCLAMAV_LIBS $LTLIBBZ2"
+save_LIBS="$LIBS"
+LIBS="$LIBCLAMAV_LIBS $LIBBZ2"
 if test "$cross_compiling" = yes; then
   ac_cv_c_cve_2008_1372=ok
 else
@@ -14907,7 +14907,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$a
 fi
 
 
-LDFLAGS="$save_LDFLAGS"
+LIBS="$save_LIBS"
 
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_c_cve_2008_1372" >&5
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
index d8b1910f2..23d262862 100644
--- a/m4/acinclude.m4
+++ b/m4/acinclude.m4
@@ -626,8 +626,8 @@ dnl Checks DoS in bzlib
 AC_DEFUN([AC_C_CVE_2008_1372],
 [AC_CACHE_CHECK([for CVE-2008-1372], [ac_cv_c_cve_2008_1372],
 [
-save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LIBCLAMAV_LIBS $LTLIBBZ2"
+save_LIBS="$LIBS"
+LIBS="$LIBCLAMAV_LIBS $LIBBZ2"
 AC_TRY_RUN([
 #include <string.h>
 #include <stdlib.h>
@@ -684,7 +684,7 @@ int main (int argc, char **argv) {
         return 0;
 }
 ], [ac_cv_c_cve_2008_1372=ok], [ac_cv_c_cve_2008_1372=bugged], [ac_cv_c_cve_2008_1372=ok])
-LDFLAGS="$save_LDFLAGS"
+LIBS="$save_LIBS"
 ])
 ])