diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index 6a48582..3eb334f 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -19,27 +19,8 @@ if [ mpi.configured ]
 
 project boost/mpi
   : source-location ../src
-  : requirements
-    -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
-    <tag>@$(__name__).tag
   ;
 
-rule tag ( name : type ? : property-set )
-{
-    local result = $(name) ;
-    if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB
-    {
-        if $(name) = boost_mpi_python && $(PYTHON_ID)
-        {
-            result = $(result)-$(PYTHON_ID) ;
-        }
-    }
-    
-    # forward to the boost tagging rule
-    return  [ indirect.call $(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag 
-                $(result) : $(type) : $(property-set) ] ;
-}
-
 lib boost_mpi 
   : 
     broadcast.cpp
@@ -88,6 +69,8 @@ libraries += boost_mpi ;
         <link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1
         <link>shared:<define>BOOST_PYTHON_DYN_LINK=1        
         <define>BOOST_MPI_PYTHON_SOURCE=1
+	-<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
+	<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag
       : # Default build
         <link>shared
       : # Usage requirements