diff --git a/README.md b/README.md
index 9c0aa66..298375c 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Of course, a lot of code duplication could be avoided by using the BorderCastle
 
 The current version of BorderCastle is derived from the Bouncy Castle version 1.81.
 
-The BorderCastle JCE provider is signed with a special JCE code signing certificate for JCE provider signing (issued by the "JCE Code Signing CA, Oracle Corporation").
+The BorderCastle JCE provider is signed with a special JCE code signing certificate for JCE provider signing (issued by the "JCE Code Signing CA, Oracle Corporation"). Check the [wiki](https://www.boarderzone.net/code/bz/bordercastle/wiki/BorderCastle-JCE-Signing 'BorderCastle Wiki - JCE Signing') for more information.
 
 This allows the provider to be used for both, on Android and with "normal" Java on desktop/server systems where the Oracle JRE requires JCE providers to be signed.
 
@@ -49,7 +49,7 @@ Binary signed downloads can be found on the [Releases page](https://www.boarderz
 
 ## Building
 
-The [Wiki](https://www.boarderzone.net/code/bz/bordercastle/wiki/Building-BorderCastle 'BorderCastle Wiki - Build Instructions') describes the necessary steps for building.
+The [wiki](https://www.boarderzone.net/code/bz/bordercastle/wiki 'BorderCastle Wiki') describes the necessary steps for [building](https://www.boarderzone.net/code/bz/bordercastle/wiki/Building-BorderCastle 'BorderCastle Wiki - Build Instructions') and the [resulting files](https://www.boarderzone.net/code/bz/bordercastle/wiki/BorderCastle-Libraries 'BorderCastle Wiki - Libraries').
 
 ## Contributors
 
diff --git a/website/index.html b/website/index.html
index 7ed479e..966ed9a 100644
--- a/website/index.html
+++ b/website/index.html
@@ -91,6 +91,9 @@
       The BorderCastle JCE provider is signed with a special JCE code signing
       certificate for JCE provider signing (issued by the "JCE Code Signing CA,
       Oracle Corporation").
+      Check the
+      <a href="https://www.boarderzone.net/code/bz/bordercastle/wiki/BorderCastle-JCE-Signing"
+        class="extLnk" target="_blank">wiki</a> for more information.
     </p>
     <p>
       This allows the provider to be used for both, on Android and with "normal"
@@ -115,9 +118,14 @@
     <h2>Building</h2>
     <p>
       The 
+      <a href="https://www.boarderzone.net/code/bz/bordercastle/wiki"
+        class="extLnk" target="_blank">wiki</a>
+      describes the necessary steps for
       <a href="https://www.boarderzone.net/code/bz/bordercastle/wiki/Building-BorderCastle"
-        class="extLnk" target="_blank">Wiki</a>
-      describes the necessary steps for building.
+        class="extLnk" target="_blank">building</a>
+      and the
+      <a href="https://www.boarderzone.net/code/bz/bordercastle/wiki/BorderCastle-Libraries"
+        class="extLnk" target="_blank">resulting files</a>.
     </p>
 
     <h2>Contributors</h2>