diff --git a/native/plugin.jelly b/native/plugin.jelly
index 8fdc9c25..2a78d2b7 100644
--- a/native/plugin.jelly
+++ b/native/plugin.jelly
@@ -115,21 +115,18 @@
         <j:forEach var="lib" items="${pom.artifacts}">
             <j:set var="dep" value="${lib.dependency}"/>
 
-            <!-- include sos-->
-            <j:if test="${dep.type=='so' or dep.type=='dll'}">
-                <j:set var="delim" value="lib"/>                
-                
-                <!-- replace ${delim} in the name -->
-                <util:tokenize var="libnameTokenizer" delim="${delim}" trim="true">${dep.artifactId}</util:tokenize>
-                <j:forEach var="libnamePart" items="${libnameTokenizer}" varStatus="index">    
-                    <j:if test="${index == 0}">
-                        <j:set var="libname" value="${libnamePart}"/>
-                    </j:if>
-                    <j:if test="${index > 0}">
-                        <j:set var="libname" value="${libname}${delim}${libnamePart}"/>
-                    </j:if>
-                </j:forEach>
+            <!-- include static and dynamic libraries for various platforms (so, a, dll, lib) -->
+            <j:if test="${dep.type=='so' or dep.type=='dll' or dep.type=='a' or dep.type=='lib'}">
                 
+				<j:set var="libname" value="${dep.artifactId}"/>
+				
+				<!-- remove ${delim} prefix in the name -->
+				<!-- only 'so' and 'a' type, we could have a name starting with 'lib'. -->
+				<j:if test="${dep.type=='so' or dep.type=='a'}">
+					<j:set var="delim" value="lib"/>                
+					<j:set var="libname" value="${libname.substring(delim.length())}"/>
+                </j:if>
+				
                 <!-- use syslibst or libset -->
                 <j:if test="${dep.getProperty('native.syslib') != 'true'}">
                     <libset dir="${lib.file.parent}" libs="${libname}-${dep.version}"/>
diff --git a/native/xdocs/changes.xml b/native/xdocs/changes.xml
index e0701558..628fd3a5 100644
--- a/native/xdocs/changes.xml
+++ b/native/xdocs/changes.xml
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.2-SNAPSHOT" date="in CVS">
+      <action dev="ltheussl" type="fix" issue="MPNATIVE-13" due-to="baleineca">Jelly tokenize incorrect behaviour.</action>
       <action dev="brett" type="add" due-to="baleineca">Checking for runtime property and adding it.  Default to "dynamic" if not present.</action>
       <action dev="brett" type="fix" issue="MPNATIVE-10" due-to="Joachim Bader">Add DLL support to the plugin</action>
       <action dev="brett" type="fix" issue="MPNATIVE-7" due-to="Joachim Bader">Changed repository location of libraries from <code>so</code> to <code>sos</code> so Maven can handle them as dependencies</action>
