diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EquinoxRegistryStrategy.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EquinoxRegistryStrategy.java
index eba2f54fb1f..42eac338863 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EquinoxRegistryStrategy.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EquinoxRegistryStrategy.java
@@ -26,14 +26,12 @@
 /**
  * The registry strategy used by the Equinox extension registry. Adds to the
  * OSGi registry:
- * <p>
  * <ul>
  * <li>Use debug information supplied via .options files</li>
  * <li>Use Eclipse logging - Use Eclipse platform state for cache
  * validation</li>
  * <li>Event scheduling is done using Eclipse job scheduling mechanism</li>
  * </ul>
- * </p>
  *
  * @since org.eclipse.equinox.registry 3.2
  */
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/RegistryStrategyOSGI.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/RegistryStrategyOSGI.java
index 7a464e61a0f..4fa471442a1 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/RegistryStrategyOSGI.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/RegistryStrategyOSGI.java
@@ -34,7 +34,6 @@
 /**
  * The registry strategy that can be used in OSGi world. It provides the
  * following functionality:
- * <p>
  * <ul>
  * <li>Translation is done with ResourceTranslator</li>
  * <li>Registry is filled with information stored in plugin.xml / fragment.xml
@@ -44,8 +43,7 @@
  * fragment.xml files</li>
  * <li>XML parser is obtained via an OSGi service</li>
  * </ul>
- * </p>
- * 
+ *
  * @see RegistryFactory#setDefaultRegistryProvider(IRegistryProvider)
  * @since org.eclipse.equinox.registry 3.2
  */
@@ -108,7 +106,7 @@ public RegistryStrategyOSGI(File[] theStorageDir, boolean[] cacheReadOnly, Objec
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * org.eclipse.core.runtime.spi.RegistryStrategy#translate(java.lang.String,
 	 * java.util.ResourceBundle)
@@ -120,7 +118,7 @@ public final String translate(String key, ResourceBundle resources) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * org.eclipse.core.runtime.spi.RegistryStrategy#translate(java.lang.String[],
 	 * org.eclipse.core.runtime.IContributor, java.lang.String)
@@ -198,7 +196,7 @@ private Bundle getBundle(String id) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * org.eclipse.core.runtime.spi.RegistryStrategy#createExecutableExtension(org.
 	 * eclipse.core.runtime.spi.RegistryContributor, java.lang.String,
@@ -256,7 +254,7 @@ private void throwException(String message, Throwable exception) throws CoreExce
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.eclipse.core.runtime.spi.RegistryStrategy#onStart(org.eclipse.core.
 	 * runtime.IExtensionRegistry, boolean)
 	 */
@@ -282,7 +280,7 @@ public void onStart(IExtensionRegistry registry, boolean loadedFromCache) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * org.eclipse.core.runtime.spi.RegistryStrategy#onStop(org.eclipse.core.runtime
 	 * .IExtensionRegistry)
@@ -307,7 +305,7 @@ public void onStop(IExtensionRegistry registry) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.eclipse.core.runtime.spi.RegistryStrategy#cacheUse()
 	 */
 	@Override
@@ -317,7 +315,7 @@ public boolean cacheUse() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.eclipse.core.runtime.spi.RegistryStrategy#cacheLazyLoading()
 	 */
 	@Override
@@ -328,7 +326,7 @@ public boolean cacheLazyLoading() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * org.eclipse.core.runtime.spi.RegistryStrategy#getContributionsTimestamp()
 	 */
@@ -369,7 +367,7 @@ public long getExtendedTimestamp(Bundle bundle, URL pluginManifest) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.eclipse.core.runtime.spi.RegistryStrategy#getXMLParser()
 	 */
 	@Override
@@ -383,7 +381,7 @@ public SAXParserFactory getXMLParser() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.eclipse.core.runtime.spi.RegistryStrategy#getLocale()
 	 */
 	@Override
diff --git a/bundles/org.eclipse.osgi/pom.xml b/bundles/org.eclipse.osgi/pom.xml
index 3de60bde129..83bcf872c3e 100644
--- a/bundles/org.eclipse.osgi/pom.xml
+++ b/bundles/org.eclipse.osgi/pom.xml
@@ -24,6 +24,7 @@
   <properties>
 	  <!-- The actual TCKs are executed in the org.eclipse.osgi.tck module because of reference to other service implementations -->
 	  <tck.skip>true</tck.skip>
+	  <failOnJavadocErrors>false</failOnJavadocErrors>
   </properties>
   
   <build>
diff --git a/pom.xml b/pom.xml
index 45163cb6bd7..a975551fb4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,6 +30,7 @@
     <!-- required by: org.eclipse.equinox.framework:launcher-binary-parent -->
     <equinox.binaries.loc>../../../equinox.binaries</equinox.binaries.loc>
     <target-platform.optionalDependencies>require</target-platform.optionalDependencies>
+    <failOnJavadocErrors>true</failOnJavadocErrors>
   </properties>
 
   <!--