diff --git a/python.jam b/python.jam
index 8f5037a0f..eead46399 100644
--- a/python.jam
+++ b/python.jam
@@ -176,7 +176,14 @@ rule Link-PYD
 
 declare-target-type PYD : <shared-linkable>true ;
 gGENERATOR_FUNCTION(PYD) = python-files ;
-SUFPYD = .pyd $(SUFDLL[2-]) ;
+if $(NT)
+{
+    SUFPYD = .pyd $(SUFDLL[2-]) ;
+}
+else
+{
+    SUFPYD = $(SUFDLL) ;
+}
 PYDMODE = $(DLLMODE) ;
 SHARED_TYPES += PYD ;
 
diff --git a/v1/python.jam b/v1/python.jam
index 8f5037a0f..eead46399 100644
--- a/v1/python.jam
+++ b/v1/python.jam
@@ -176,7 +176,14 @@ rule Link-PYD
 
 declare-target-type PYD : <shared-linkable>true ;
 gGENERATOR_FUNCTION(PYD) = python-files ;
-SUFPYD = .pyd $(SUFDLL[2-]) ;
+if $(NT)
+{
+    SUFPYD = .pyd $(SUFDLL[2-]) ;
+}
+else
+{
+    SUFPYD = $(SUFDLL) ;
+}
 PYDMODE = $(DLLMODE) ;
 SHARED_TYPES += PYD ;