diff --git a/ChangeLog b/ChangeLog
index 798f04b1..96140db7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-17  Marcus Brinkmann  <marcus@g10code.de>
+
+	* configure.ac: Make largefile check more robust.
+
 2009-12-10  Werner Koch  <wk@g10code.com>
 
 	* configure.ac: Check for getgid and getegid.
diff --git a/configure.ac b/configure.ac
index 85782971..cb3db3d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -207,8 +207,8 @@ AC_TYPE_UINTPTR_T
 # A simple compile time check in gpgme.h for GNU/Linux systems that
 # prevents a file offset bits mismatch between gpgme and the application.
 NEED__FILE_OFFSET_BITS=0
-case $ac_cv_sys_file_offset_bits in
-  no | unknown) ;;
+case "$ac_cv_sys_file_offset_bits" in
+  "" | no | unknown) ;;
   *)
   NEED__FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits
   ;;