diff --git a/ChangeLog b/ChangeLog
index acb71de7d1..3a89826176 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec  8 11:28:53 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
+
+	* src/storage_conf.c: Workaround missing ULLONG_MAX in
+	Debian etch's limits.h
+
 Mon Dec  8 11:17:53 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
 
 	* src/qemu_driver.c, src/uml_driver.c: Fix guest autostart
diff --git a/src/storage_conf.c b/src/storage_conf.c
index 522fc984ba..ca3e0b2aa5 100644
--- a/src/storage_conf.c
+++ b/src/storage_conf.c
@@ -43,6 +43,11 @@
 #include "util.h"
 #include "memory.h"
 
+/* Work around broken limits.h on debian etch */
+#if defined __GNUC__ && defined _GCC_LIMITS_H_ && ! defined ULLONG_MAX
+# define ULLONG_MAX   ULONG_LONG_MAX
+#endif
+
 #define virStorageLog(msg...) fprintf(stderr, msg)
 
 VIR_ENUM_IMPL(virStoragePool,