diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG
index 7319ebbb2f1cd484a083b51086b5df3f40369f81..db08519669017e9b77f2daaf11a62703ba166cd0 100644
--- a/sm5/CHANGELOG
+++ b/sm5/CHANGELOG
@@ -1,6 +1,6 @@
 CHANGELOG for smartmontools
 
-$Id: CHANGELOG,v 1.644 2007/12/08 18:05:55 shattered Exp $
+$Id: CHANGELOG,v 1.645 2007/12/20 17:34:18 chrfranke Exp $
 
 The most recent version of this file is:
 http://smartmontools.cvs.sourceforge.net/smartmontools/sm5/CHANGELOG?view=markup
@@ -34,6 +34,9 @@ NOTES FOR FUTURE RELEASES: see TODO file.
 
 <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
 
+  [CF] Added compiler.h to cciss_ioctl.h header check to prevent
+       configure warning.
+
   [SS] DragonFly support added (using os_freebsd code; untested).
 
   [CF] smartctl: Fixed ATA identify byte swapping issue on big-endian
diff --git a/sm5/configure.in b/sm5/configure.in
index 6c51a5c9f2578d7e836695806d8615f752c548f4..148121efc69f3ab039805405f2a5f29b69446cae 100644
--- a/sm5/configure.in
+++ b/sm5/configure.in
@@ -1,5 +1,5 @@
 #
-# $Id: configure.in,v 1.128 2007/12/08 17:11:11 shattered Exp $
+# $Id: configure.in,v 1.129 2007/12/20 17:34:18 chrfranke Exp $
 #
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.50)
@@ -7,7 +7,7 @@ AC_INIT(smartmontools, 5.38, smartmontools-support@lists.sourceforge.net)
 AC_CONFIG_SRCDIR(smartctl.cpp)
 
 smartmontools_configure_date=`date -u +"%Y/%m/%d %T %Z"`
-smartmontools_cvs_tag=`echo '$Id: configure.in,v 1.128 2007/12/08 17:11:11 shattered Exp $'`
+smartmontools_cvs_tag=`echo '$Id: configure.in,v 1.129 2007/12/20 17:34:18 chrfranke Exp $'`
 smartmontools_release_date=2006/12/20
 smartmontools_release_time="20:37:59 UTC"
 
@@ -65,10 +65,14 @@ dnl Check for FreeBSD twa include files...
 AC_CHECK_HEADERS([sys/tw_osl_ioctl.h])
 dnl Check for FreeBSD ciss include files...
 AC_CHECK_HEADERS([dev/ciss/cissio.h])
-dnl Check for Linux CCISS include file
-AC_CHECK_HEADERS([linux/cciss_ioctl.h])
-dnl This header file needed at least for SuSE LINUX
+dnl This header file is needed for cciss_ioctl.h at least on SuSE LINUX
 AC_CHECK_HEADERS([linux/compiler.h])
+dnl Check for Linux CCISS include file
+AC_CHECK_HEADERS([linux/cciss_ioctl.h], [], [], [AC_INCLUDES_DEFAULT
+#ifdef HAVE_LINUX_COMPILER_H
+# include <linux/compiler.h>
+#endif
+])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_CHECK_TYPES([int64_t, uint64_t])