diff --git a/build/update-setup-h b/build/update-setup-h
index 43a1632691..39c854ae0b 100755
--- a/build/update-setup-h
+++ b/build/update-setup-h
@@ -38,9 +38,12 @@ if [ ! -f wxwin.m4 ]; then
 fi
 
 update_single_setup_h include/wx/msw/setup0.h
+update_single_setup_h include/wx/mac/setup0.h
 
 # get rid of C++ comments in this file
 #update_single_setup_h setup.h.in
 #sed -i -e '/^\/\//d' -e 's@ *//.*$@@' setup.h.in
 
 exit $rc
+
+# vi: set ft=sh:
diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index 210495eac6..624e0405aa 100644
--- a/include/wx/mac/setup0.h
+++ b/include/wx/mac/setup0.h
@@ -12,6 +12,9 @@
 #ifndef _WX_SETUP_H_
 #define _WX_SETUP_H_
 
+
+/* --- start common options --- */
+
 // ----------------------------------------------------------------------------
 // global settings
 // ----------------------------------------------------------------------------
@@ -75,11 +78,7 @@
 // Default is 1.
 //
 // Recommended setting: 1 but see comment above
-#ifndef __MWERKS__
 #define wxUSE_DEBUG_CONTEXT       0
-#else
-#define wxUSE_DEBUG_CONTEXT       1
-#endif
 
 // If 1, enables debugging versions of wxObject::new and wxObject::delete *IF*
 // __WXDEBUG__ is also defined.
@@ -216,11 +215,7 @@
 #define wxUSE_STREAMS       1
 
 // Use standard C++ streams if 1. If 0, use wxWin streams implementation.
-#ifndef __MWERKS__
 #define wxUSE_STD_IOSTREAM  0
-#else
-#define wxUSE_STD_IOSTREAM  1
-#endif
 
 // Use serialization (requires utils/serialize)
 #define wxUSE_SERIAL        0
@@ -944,6 +939,39 @@
 // NOW MANDATORY: don't change.
 #define wxUSE_DYNAMIC_CLASSES     1
 
+/* --- end common options --- */
+
+// ----------------------------------------------------------------------------
+// Mac-specific settings
+// ----------------------------------------------------------------------------
+
+// override some settings for Metrowerks
+//
+// VZ: isn't this file only used when building with Metrowerks anyhow?
+#ifdef __MWERKS__
+    #undef wxUSE_DEBUG_CONTEXT
+    #define wxUSE_DEBUG_CONTEXT 1
+
+    #undef wxUSE_STD_IOSTREAM
+    #define wxUSE_STD_IOSTREAM  1
+#endif
+
+// things not implemented under Mac
+#undef wxUSE_POPUPWIN
+#define wxUSE_POPUPWIN 0
+
+#undef wxUSE_TIPWINDOW
+#define wxUSE_TIPWINDOW 0
+
+#undef wxUSE_TOGGLEBTN
+#define wxUSE_TOGGLEBTN 0
+
+// wxWebKit is a wrapper for Apple's WebKit framework, use it if you want to
+// embed the Safari browser control
+// 0 by default because of Jaguar compatibility problems
+#define wxUSE_WEBKIT        0
+
+
 // Set to 0 for no libmspack
 #define wxUSE_LIBMSPACK     0