diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a68d60c67..49313b56e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D1X-Rebirth Changelog
 
+20101224
+--------
+arch/carbon/conf.h: Disabling IPv6 support for OS X since in Snow Leopard it's buggy, making all Multiplayer pretty much impossible - re-activating soon as proper patches from Apple are in sight
+
 20101223
 --------
 main/net_udp.c, main/net_udp.h: Reworked object sending/receiving to work without unnecessary type casting and a bit less error prone; Also increased UDP max packet size to 2048 so we can send 7 objects per frame
diff --git a/arch/carbon/conf.h b/arch/carbon/conf.h
index 274f38644..efff868b6 100644
--- a/arch/carbon/conf.h
+++ b/arch/carbon/conf.h
@@ -47,7 +47,7 @@
 # define USE_UDP
 //# define USE_IPX
 
-#define IPv6
+//#define IPv6
 
 /* Define to 1 if the system has the type `struct timespec'. */
 #define HAVE_STRUCT_TIMESPEC 1