diff --git a/CHANGES b/CHANGES
index 6b20c79df..a1931457d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 CHANGES IN FLTK 1.3.0
 
+	- Temporarily limited builds to 32-bit on OX S to stay
+	  compatible to Snow Leopard
 	- Fixed Windows compile bug with "#define USE_COLORMAP 0"
 	  (STR #2241)
 	- Fixed glibc 2.10 compiler problems (Fedora 11 and others)
diff --git a/configure.in b/configure.in
index bbc178df5..12299fc46 100644
--- a/configure.in
+++ b/configure.in
@@ -92,6 +92,17 @@ case $uname in
 	    fi
 	fi
 	;;
+
+    Darwin*)
+        # Starting with 10.6 (Snow Leopard), OS X does not support
+        # Carbon calls anymore. We patch this until we are completely Cocoa compliant
+        # by limiting ourselves to 32 bit Intel compiles
+        if test `sw_vers -productVersion` = "10.6"; then
+            CFLAGS="$CFLAGS -arch i386"
+            CXXFLAGS="$CXXFLAGS -arch i386"
+            LDFLAGS="$LDFLAGS -arch i386"
+        fi
+        ;;
 esac
 
 dnl Define the libraries and link options we will need.