diff --git a/tools/doxygen.jam b/tools/doxygen.jam
index cb38b5420..22f91200e 100644
--- a/tools/doxygen.jam
+++ b/tools/doxygen.jam
@@ -75,8 +75,8 @@ rule headers-to-doxyfile ( target : sources * : properties * )
   # Translate <doxygen:param> into command line flags.  
   for local param in [ feature.get-values <doxygen:param> : $(properties) ]
   {
-    local namevalue = [ regex.split $(param) "=" ] ;
-    text += "$(namevalue[1])=$(namevalue[2])" ;
+    local namevalue = [ regex.match ([^=]*)=(.*) : $(param) ] ;
+    text += "$(namevalue[1]) = $(namevalue[2])" ;
   }
  
   local headers = "" ;
diff --git a/v2/tools/doxygen.jam b/v2/tools/doxygen.jam
index cb38b5420..22f91200e 100644
--- a/v2/tools/doxygen.jam
+++ b/v2/tools/doxygen.jam
@@ -75,8 +75,8 @@ rule headers-to-doxyfile ( target : sources * : properties * )
   # Translate <doxygen:param> into command line flags.  
   for local param in [ feature.get-values <doxygen:param> : $(properties) ]
   {
-    local namevalue = [ regex.split $(param) "=" ] ;
-    text += "$(namevalue[1])=$(namevalue[2])" ;
+    local namevalue = [ regex.match ([^=]*)=(.*) : $(param) ] ;
+    text += "$(namevalue[1]) = $(namevalue[2])" ;
   }
  
   local headers = "" ;