diff --git a/webconsole/changelog.txt b/webconsole/changelog.txt
index e1256eb..877a965 100644
--- a/webconsole/changelog.txt
+++ b/webconsole/changelog.txt
@@ -7,6 +7,7 @@
     * [FELIX-4995] - NPE when updating Apache Felix OSGi Management Console configuration without a password
     * [FELIX-5004] - Null is passed to BundleInfoProvider if plugin root is null
     * [FELIX-5031] - NPE in Web Console configuration plugin when metatype service is missing
+    * [FELIX-5041] - Cannot build web console with JDK 1.8 due to javadoc problems
 
 ** Improvement
     * [FELIX-5018] - [webconsole] "create factory configuration" link for config screen
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/AbstractWebConsolePlugin.java b/webconsole/src/main/java/org/apache/felix/webconsole/AbstractWebConsolePlugin.java
index 9d52489..ab9b7f6 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/AbstractWebConsolePlugin.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/AbstractWebConsolePlugin.java
@@ -207,7 +207,7 @@
     /**
      * Detects whether this request is intended to have the headers and
      * footers of this plugin be rendered or not. This method always returns
-     * <code>true</true> and may be overwritten by plugins to detect
+     * <code>true</code> and may be overwritten by plugins to detect
      * from the actual request, whether or not to render the header and
      * footer.
      *
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/DefaultBrandingPlugin.java b/webconsole/src/main/java/org/apache/felix/webconsole/DefaultBrandingPlugin.java
index 472f2d4..147a5bc 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/DefaultBrandingPlugin.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/DefaultBrandingPlugin.java
@@ -34,7 +34,7 @@
  * <p>
  * This default implementation provides Apache Felix based default branding
  * as follows:
- * <table>
+ * <table summary="Web Console Branding Properties">
  * <tr><th>Name</th><th>Property Name</th><th>Default Value</th></tr>
  * <tr>
  *  <td>Brand Name</td>
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/DefaultVariableResolver.java b/webconsole/src/main/java/org/apache/felix/webconsole/DefaultVariableResolver.java
index baf7f67..dfdb7fa 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/DefaultVariableResolver.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/DefaultVariableResolver.java
@@ -47,7 +47,7 @@
 
 
     /**
-     * Creates a new variable resolver and initializes both - capacity & load factor
+     * Creates a new variable resolver and initializes both - capacity &amp; load factor
      * 
      * @param initialCapacity  the initial capacity of the variable container
      * @param loadFactor the load factor of the variable container
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/WebConsoleConstants.java b/webconsole/src/main/java/org/apache/felix/webconsole/WebConsoleConstants.java
index 47168fc..fd9064a 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/WebConsoleConstants.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/WebConsoleConstants.java
@@ -161,7 +161,7 @@
      * {@link AbstractWebConsolePlugin#renderTopNavigation(javax.servlet.http.HttpServletRequest, java.io.PrintWriter)}
      * method does.
      * <p>
-     * The type of this request attribute is <code>Map<String, String></code>.
+     * The type of this request attribute is <code>Map&lt;String, String&gt;</code>.
      *
      * @since 2.0.0
      */
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/WebConsoleUtil.java b/webconsole/src/main/java/org/apache/felix/webconsole/WebConsoleUtil.java
index d7ae364..4143fab 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/WebConsoleUtil.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/WebConsoleUtil.java
@@ -251,7 +251,7 @@
     }
 
     /**
-     * Escapes HTML special chars like: <>&\r\n and space
+     * Escapes HTML special chars like: &lt;&gt;&amp;\r\n and space
      *
      *
      * @param text the text to escape