diff --git a/ChangeLog b/ChangeLog
index 7a6ddeb5..5181e942 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jan 27 10:51:39 CET 2011
+	Disable 'EXTRA_CHECKS's by default as suggested in #1652
+ 	(I guess it is time). -CG/timn
+
 Thu Jan 27 10:48:55 CET 2011
 	Removing bogus assertion in basic authentication code (#1651). -CG/timn
 
diff --git a/src/daemon/internal.h b/src/daemon/internal.h
index 6d90b787..4fb79583 100644
--- a/src/daemon/internal.h
+++ b/src/daemon/internal.h
@@ -33,7 +33,11 @@
 #include <gnutls/gnutls.h>
 #endif
 
-#define EXTRA_CHECKS MHD_YES
+/**
+ * Should we perform additional sanity checks at runtime (on our internal
+ * invariants)?  This may lead to aborts, but can be useful for debugging.
+ */
+#define EXTRA_CHECKS MHD_NO
 
 #define MHD_MAX(a,b) ((a)<(b)) ? (b) : (a)
 #define MHD_MIN(a,b) ((a)<(b)) ? (a) : (b)