diff --git a/python.jam b/python.jam
index 0a1ba1e0f..6c6126c92 100644
--- a/python.jam
+++ b/python.jam
@@ -137,10 +137,13 @@ rule select-python-library ( toolset variant : properties * )
     }
     if $(OS) = MACOSX && $(toolset) = darwin
     {
-        properties = [ replace $(properties) : <shared-link>dynamic <shared-link>bundle ] ;
-        properties +=
-            <bundle-loader>$(PYTHON_ROOT)/bin/python$(PYTHON_VERSION)
-            ;
+        if <target-type>PYD in $(properties)
+        {
+            properties +=
+                <bundle-loader>$(PYTHON_ROOT)/bin/python$(PYTHON_VERSION)
+                ;
+        }
+        properties += <framework>Python ;
     }
     return $(properties) ;
 }
@@ -290,6 +293,10 @@ if $(NT)
 {
     SUFPYD = .pyd $(SUFDLL[2-]) ;
 }
+else if $(OS) = MACOSX
+{
+    SUFPYD = .so $(SUFDLL[2-]) ;
+}
 else
 {
     SUFPYD = $(SUFDLL) ;
diff --git a/v1/python.jam b/v1/python.jam
index 0a1ba1e0f..6c6126c92 100644
--- a/v1/python.jam
+++ b/v1/python.jam
@@ -137,10 +137,13 @@ rule select-python-library ( toolset variant : properties * )
     }
     if $(OS) = MACOSX && $(toolset) = darwin
     {
-        properties = [ replace $(properties) : <shared-link>dynamic <shared-link>bundle ] ;
-        properties +=
-            <bundle-loader>$(PYTHON_ROOT)/bin/python$(PYTHON_VERSION)
-            ;
+        if <target-type>PYD in $(properties)
+        {
+            properties +=
+                <bundle-loader>$(PYTHON_ROOT)/bin/python$(PYTHON_VERSION)
+                ;
+        }
+        properties += <framework>Python ;
     }
     return $(properties) ;
 }
@@ -290,6 +293,10 @@ if $(NT)
 {
     SUFPYD = .pyd $(SUFDLL[2-]) ;
 }
+else if $(OS) = MACOSX
+{
+    SUFPYD = .so $(SUFDLL[2-]) ;
+}
 else
 {
     SUFPYD = $(SUFDLL) ;