diff --git a/native/plugin.jelly b/native/plugin.jelly
index c381b1f9..0b03c398 100644
--- a/native/plugin.jelly
+++ b/native/plugin.jelly
@@ -50,9 +50,39 @@
        <cc outfile="${maven.build.dir}/native/_" link="${maven.native.link}" debug="${maven.native.debug}">
          <compiler name="${maven.native.compiler.name}">
            <compilerparam name="target" value="${maven.native.compiler.target}"/>
+
+           <util:tokenize var="argumentList" delim=" " trim="true">${maven.native.compiler.arg.start}</util:tokenize>
+           <j:forEach var="arg" items="${argumentList}">
+            <compilerarg location="start" value="${arg}"/>
+           </j:forEach>
+
+           <util:tokenize var="argumentList" delim=" " trim="true">${maven.native.compiler.arg.mid}</util:tokenize>
+           <j:forEach var="arg" items="${argumentList}">
+            <compilerarg location="mid" value="${arg}"/>
+           </j:forEach>
+
+           <util:tokenize var="argumentList" delim=" " trim="true">${maven.native.compiler.arg.end}</util:tokenize>
+           <j:forEach var="arg" items="${argumentList}">
+            <compilerarg location="end" value="${arg}"/>
+           </j:forEach>
           </compiler>
          <linker name="${maven.native.linker.name}">     
            <linkerparam name="target" value="${maven.native.linker.target}"/>
+
+           <util:tokenize var="argumentList" delim=" " trim="true">${maven.native.linker.arg.start}</util:tokenize>
+           <j:forEach var="arg" items="${argumentList}">
+            <linkerarg location="start" value="${arg}"/>
+           </j:forEach>
+
+           <util:tokenize var="argumentList" delim=" " trim="true">${maven.native.linker.arg.mid}</util:tokenize>
+           <j:forEach var="arg" items="${argumentList}">
+            <linkerarg location="mid" value="${arg}"/>
+           </j:forEach>
+
+           <util:tokenize var="argumentList" delim=" " trim="true">${maven.native.linker.arg.end}</util:tokenize>
+           <j:forEach var="arg" items="${argumentList}">
+            <linkerarg location="end" value="${arg}"/>
+           </j:forEach>
          </linker>
          <fileset dir="${maven.native.src}"  includes="${maven.native.src.includes}" excludes="${maven.native.src.excludes}"/>
          <j:if test="${jniFilesPresent == 'true'}">
diff --git a/native/xdocs/changes.xml b/native/xdocs/changes.xml
index ebcd0081..b6501ee7 100644
--- a/native/xdocs/changes.xml
+++ b/native/xdocs/changes.xml
@@ -25,8 +25,10 @@
   </properties>
   <body>
     <release version="1.1-SNAPSHOT" date="in CVS">
-      <action dev="brett" type="fix" issue="MPNATIVE-3" due-to="Joachim Bader">Use properties more</action>
-      <action dev="brett" type="fix" issue="MPNATIVE-1" due-to="Joachim Bader">Help javah work on all JDK features</action>
+      <action dev="brett" type="add" issue="MPNATIVE-5" due-to="Joachim Bader">add src includes/excludes.</action>
+      <action dev="brett" type="add" issue="MPNATIVE-4" due-to="Joachim Bader">Linker and compiler argument passing.</action>
+      <action dev="brett" type="add" issue="MPNATIVE-3" due-to="Joachim Bader">Use properties more.</action>
+      <action dev="brett" type="fix" issue="MPNATIVE-1" due-to="Joachim Bader">Help javah work on all JDK features.</action>
     </release>
   </body>
 </document>
