diff --git a/qbsp/qbsp.h b/qbsp/qbsp.h
index 8fe06618..a41f9caf 100644
--- a/qbsp/qbsp.h
+++ b/qbsp/qbsp.h
@@ -107,17 +107,22 @@
 #define	AMBIENT_LAVA	3
 #define	NUM_AMBIENTS	4	// automatic ambient sounds
 
-// Misc values
-#define	ANGLEEPSILON		0.00001
-#define	NORMAL_EPSILON		0.0001
-#define EQUAL_EPSILON		0.001
-#define DIST_EPSILON		0.001
-#define	ZERO_EPSILON		0.001
-#define CONTINUOUS_EPSILON	0.001
-#define	DISTEPSILON		0.01
-#define	POINT_EPSILON		0.01
-#define	T_EPSILON		0.01
-#define ON_EPSILON		0.05
+/*
+ * The quality of the bsp output is highly sensitive to these epsilon values.
+ * Notes:
+ * - CONTINUOUS_EPSILON needs to be slightly larger than EQUAL_EPSILON,
+ *   otherwise this messes with t-junctions
+ */
+#define NORMAL_EPSILON		0.000001
+#define ANGLEEPSILON		0.000001
+#define DIST_EPSILON		0.0001
+#define ZERO_EPSILON		0.0001
+#define DISTEPSILON		0.0001
+#define POINT_EPSILON		0.0001
+#define T_EPSILON		0.0001
+#define ON_EPSILON		0.0001
+#define EQUAL_EPSILON		0.0001
+#define CONTINUOUS_EPSILON	0.0005
 
 #define BOGUS_RANGE	18000