diff --git a/boost-install.jam b/boost-install.jam
index 05c0d83..d2c645c 100644
--- a/boost-install.jam
+++ b/boost-install.jam
@@ -71,13 +71,38 @@ local rule remap-library ( lib )
 
         return "bz2" ;
 
+    case "icuuc" :
+
+        if [ modules.peek : ICU_ICUUC_NAME ]
+        {
+            return [ modules.peek : ICU_ICUUC_NAME ] ;
+        }
+        else
+        {
+            return "icuuc" ;
+        }
+
     case "icudt" :
 
-        return "icudata" ;
+        if [ modules.peek : ICU_ICUDT_NAME ]
+        {
+            return [ modules.peek : ICU_ICUDT_NAME ] ;
+        }
+        else
+        {
+            return "icudata" ;
+        }
 
     case "icuin" :
 
-        return "icui18n" ;
+        if [ modules.peek : ICU_ICUIN_NAME ]
+        {
+            return [ modules.peek : ICU_ICUIN_NAME ] ;
+        }
+        else
+        {
+            return "icui18n" ;
+        }
 
     case * :