diff --git a/build.xml b/build.xml
index 8b83699037..f9f1975908 100644
--- a/build.xml
+++ b/build.xml
@@ -1154,6 +1154,7 @@ under the License.
                 <path refid="main.classpath"/>
                 <path refid="scratchpad.classpath"/>
                 <path refid="ooxml.classpath"/>
+            	<path refid="ooxml.xmlsec.classpath"/>
                 <path path="${env.CLASSPATH}"/>
             </classpath>
 
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java
index 71602c6d09..25efc1e559 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java
+++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java
@@ -405,7 +405,7 @@ public class SignatureConfig {
     
     /**
      * @param tspOldProtocol defines the timestamp-protocol mimetype
-     * @see {@link #isTspOldProtocol()}
+     * @see #isTspOldProtocol
      */
     public void setTspOldProtocol(boolean tspOldProtocol) {
         this.tspOldProtocol = tspOldProtocol;
@@ -881,7 +881,7 @@ public class SignatureConfig {
     /**
      * @return the cannonicalization method for XAdES-XL signing.
      * Defaults to <code>EXCLUSIVE</code>
-     * @see {@link CanonicalizationMethod}
+     * @see <a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/crypto/dsig/CanonicalizationMethod.html">javax.xml.crypto.dsig.CanonicalizationMethod</a>
      */
     public String getXadesCanonicalizationMethod() {
         return xadesCanonicalizationMethod;
@@ -889,7 +889,7 @@ public class SignatureConfig {
 
     /**
      * @param xadesCanonicalizationMethod the cannonicalization method for XAdES-XL signing
-     * @see {@link CanonicalizationMethod}
+     * @see <a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/crypto/dsig/CanonicalizationMethod.html">javax.xml.crypto.dsig.CanonicalizationMethod</a>
      */
     public void setXadesCanonicalizationMethod(String xadesCanonicalizationMethod) {
         this.xadesCanonicalizationMethod = xadesCanonicalizationMethod;