diff --git a/api/x_opengl.C b/api/x_opengl.C
index c2cc4629a5..27449e726a 100644
--- a/api/x_opengl.C
+++ b/api/x_opengl.C
@@ -101,7 +101,11 @@ static bool glut_is_initialized = false;
 //
 // If running freeglut, also get the version.
 //
+#ifdef __APPLE__
+static bool glut_is_freeglut = false;   // Avoid warning message to stderr from glutGet(GLUT_VERSION) 
+#else
 static bool glut_is_freeglut = true;
+#endif
 static int glut_version = 0;
 
 
diff --git a/checkin_notes b/checkin_notes
index b27b8c4cf9..61249b5d29 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -8903,3 +8903,16 @@ David  16 Aug 2006
     client/
         cs_scheduler.C
         gui_rpc_server_ops.C
+
+Charlie 17 Aug 2006
+    - Mac: Add support for hostinfo p_capabilities.  For PowerPC Macs. 
+        this just sets the string to "AltiVec" if AltiVec available. 
+        For Intel Macs, this is a string of multiple 3-character 
+        values, including MMX, SSE, SSE2, SSE3 when supported.
+    - Initialize glut_is_freeglut=false for Mac, to avoid warning 
+            message to stderr from calling glutGet(GLUT_VERSION).
+            
+    api/
+        x_opengl.C
+    client/
+        hostinfo_unix.C
diff --git a/client/hostinfo_unix.C b/client/hostinfo_unix.C
index 21bf54299b..fe712d2ca2 100644
--- a/client/hostinfo_unix.C
+++ b/client/hostinfo_unix.C
@@ -492,6 +492,20 @@ int HOST_INFO::get_host_info() {
 #endif
 #endif
 
+#ifdef __APPLE__
+#ifdef __i386__
+    len = sizeof(p_capabilities);
+    sysctlbyname("machdep.cpu.features", p_capabilities, &len, NULL, 0);
+#else       // PowerPC
+    int response = 0;
+    int retval;
+    len = sizeof(response);
+    retval = sysctlbyname("hw.optional.altivec", &response, &len, NULL, 0);
+    if (response && (!retval)) 
+        safe_strcpy(p_capabilities, "AltiVec");
+#endif  // i386 or PowerPC
+#endif  // __APPLE__
+
     get_local_network_info();
 
     timezone = get_timezone();
diff --git a/doc/versions.inc b/doc/versions.inc
index bd0f747627..d41aafaa80 100644
--- a/doc/versions.inc
+++ b/doc/versions.inc
@@ -34,7 +34,7 @@ function type_text($type) {
 $features_55 = "
     <li> New CPU Scheduler.
     <li> New Work Fetch Policy.
-    <li> CPU Capability detection (currently implemented only for Windows & Linux).
+    <li> CPU Capability detection.
     <li> Revamped logging solution.
     <li> Improved security for POSIX compliant systems
          (only implemented for the Mac)