diff --git a/centrallix/include/cxss/cxss.h b/centrallix/include/cxss/cxss.h
index 98fa11af1..21ff01569 100644
--- a/centrallix/include/cxss/cxss.h
+++ b/centrallix/include/cxss/cxss.h
@@ -42,11 +42,23 @@
 #include "cxlib/xarray.h"
 #include "cxlib/xstring.h"
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #define CXSS_ENTROPY_SIZE	1280
-#define CXSS_DEBUG_CONTEXTSTACK	1
 #define CXSS_IDENTIFIER_LENGTH	64
 #define CXSS_CIPHER_STRENGTH	(256 / 8)
 
+#ifdef USING_OPTIMIZATION
+/*** Context stack debugging can cause seg-faults if the compiler applies
+ *** certain optimizations.
+ ***/
+#define CXSS_DEBUG_CONTEXTSTACK	0
+#else
+#define CXSS_DEBUG_CONTEXTSTACK 1
+#endif
+
 #include "cxss/policy.h"
 
 /*** CXSS data structures ***/
@@ -170,4 +182,3 @@ int cxssAuthorizeSpec(char* objectspec, int access_type, int log_mode);
 int cxssAuthorize(char* domain, char* type, char* path, char* attr, int access_type, int log_mode);
 
 #endif /* not defined _CXSS_H */
-