diff --git a/src/tools/mpi.jam b/src/tools/mpi.jam
index bad0615b8..12c2993e9 100644
--- a/src/tools/mpi.jam
+++ b/src/tools/mpi.jam
@@ -163,7 +163,20 @@ rule cmdline_to_features ( cmdline : unknown-features ? )
                local add = [ add_feature $(prefix) $(name) $(cmdline) ] ;
 
                if $(add) {
-                  result += $(add[1]) ;
+
+                  if $(add[1]) = <find-shared-library>pthread
+                  {
+                      # Uhm. It's not really nice that this MPI implementation
+                      # uses -lpthread as opposed to -pthread. We do want to
+                      # set <threading>multi, instead of -lpthread.
+                      result += "<threading>multi" ;
+                      MPI_EXTRA_REQUIREMENTS += "<threading>multi" ;                      
+                  }
+                  else
+                  {                      
+                      result += $(add[1]) ;                  
+                  }
+                                     
                   cmdline = $(add[2]) ;
                   matched = yes ;
                }