diff --git a/src/org/apache/xerces/dom/NodeImpl.java b/src/org/apache/xerces/dom/NodeImpl.java
index 9766a1f06..84b386ca0 100644
--- a/src/org/apache/xerces/dom/NodeImpl.java
+++ b/src/org/apache/xerces/dom/NodeImpl.java
@@ -1357,7 +1357,7 @@ else if (current==thisNode) {
      * <p>The string returned is made of the text content of this node
      * depending on its type, as defined below:</p>
      *
-     * <table border='1'>
+     * <table role="presentation" border='1'>
      * <tr>
      *   <th>Node type</th>
      *   <th>Content</th>
@@ -1412,7 +1412,7 @@ void getTextContent(StringBuffer buf) throws DOMException {
      * <p>The string returned is made of the text content of this node
      * depending on its type, as defined below:</p>
      *
-     * <table border='1'>
+     * <table role="presentation" border='1'>
      * <tr>
      *   <th>Node type</th>
      *   <th>Content</th>
diff --git a/src/org/apache/xerces/jaxp/datatype/DatatypeFactoryImpl.java b/src/org/apache/xerces/jaxp/datatype/DatatypeFactoryImpl.java
index 98b1a7f50..625db0010 100644
--- a/src/org/apache/xerces/jaxp/datatype/DatatypeFactoryImpl.java
+++ b/src/org/apache/xerces/jaxp/datatype/DatatypeFactoryImpl.java
@@ -239,7 +239,7 @@ public XMLGregorianCalendar newXMLGregorianCalendar(final String lexicalRepresen
     /**
      * <p>Create an <code>XMLGregorianCalendar</code> from a {@link GregorianCalendar}.</p> 
      *
-     * <table border="1" rules="all" cellpadding="2">
+     * <table role="presentation" border="1" rules="all" cellpadding="2">
      *   <thead>
      *     <tr>
      *       <th style="text-align: center;" colspan="2">
diff --git a/src/org/apache/xerces/jaxp/datatype/XMLGregorianCalendarImpl.java b/src/org/apache/xerces/jaxp/datatype/XMLGregorianCalendarImpl.java
index e92b67ce7..126e78ee0 100644
--- a/src/org/apache/xerces/jaxp/datatype/XMLGregorianCalendarImpl.java
+++ b/src/org/apache/xerces/jaxp/datatype/XMLGregorianCalendarImpl.java
@@ -56,7 +56,7 @@
  * </p>
  * 
  * <a name="datetimefieldsmapping"></a>
- * <table border="1">
+ * <table role="presentation" border="1">
  *   <caption>Mappings between XML Schema 1.0 datetime fields and XMLGregorianCalendar accessors</caption>
  *   <thead>
  *     <tr>
@@ -641,7 +641,7 @@ private XMLGregorianCalendarImpl(
 	 * <p>Convert a <code>java.util.GregorianCalendar</code> to XML Schema 1.0 
 	 * representation.</p>
 	 *
-	 * <table border="1">
+	 * <table role="presentation" border="1">
 	 *   <thead>
 	 *     <tr>
 	 *       <th colspan="2">
@@ -1818,7 +1818,7 @@ else if (typekind == DatatypeConstants.GMONTHDAY) {
      * <p>Return the name of the XML Schema date/time type that this instance 
      * maps to. Type is computed based on fields that are set.</p>
      *
-     * <table border="1">
+     * <table role="presentation" border="1">
      *   <thead>
      *     <tr>
      *       <th colspan="7">
@@ -2387,7 +2387,7 @@ private static int maximumDayInMonthFor(int year, int month) {
      * instance, see 
      * {@link #toGregorianCalendar(TimeZone, Locale, XMLGregorianCalendar)}.</p>
      * 
-     * <table border="1">
+     * <table role="presentation" border="1">
      *   <thead>
      *     <tr>
      *       <th colspan="2">
diff --git a/src/org/apache/xerces/util/EncodingMap.java b/src/org/apache/xerces/util/EncodingMap.java
index 5123394fa..59f1def75 100644
--- a/src/org/apache/xerces/util/EncodingMap.java
+++ b/src/org/apache/xerces/util/EncodingMap.java
@@ -25,7 +25,7 @@
  * <strong>must</strong> be the IANA encoding names specified or one of the aliases for 
  * those names which IANA defines.
  *
- * <table>
+ * <table role="presentation">
  *  <caption>Mapping between IANA encoding names and Java encoding names</caption>
  *  <tr>
  *      <td>
diff --git a/src/org/apache/xerces/xs/datatypes/XSDateTime.java b/src/org/apache/xerces/xs/datatypes/XSDateTime.java
index 147fbf1ce..064abba1e 100644
--- a/src/org/apache/xerces/xs/datatypes/XSDateTime.java
+++ b/src/org/apache/xerces/xs/datatypes/XSDateTime.java
@@ -25,7 +25,7 @@
  * marks whether a particular method is defined for a particular type. Accessing undefined
  * methods may return unexpected values.
  * 
- * <table border="1">
+ * <table role="presentation" border="1">
  * <tr>
  * <td> XML Schema Datatype </td>
  * <td> getYears() </td>
diff --git a/src/org/apache/xerces/xs/datatypes/package.html b/src/org/apache/xerces/xs/datatypes/package.html
index c866494cb..7e61b4e63 100644
--- a/src/org/apache/xerces/xs/datatypes/package.html
+++ b/src/org/apache/xerces/xs/datatypes/package.html
@@ -26,7 +26,7 @@
 The table below gives the data type to applicable interface mapping:
 <BR>
 <BR>
-<TABLE border="1">
+<TABLE role="presentation" border="1">
 	<TBODY>
 		<TR>
 			<TD style="width: 332px; text-align: center;">XML Schema Data Type</TD>
@@ -224,7 +224,7 @@
 
 <P><BR>
 </P>
-<TABLE border="1">
+<TABLE role="presentation" border="1">
 	<TBODY>
 		<TR>
 			<TD style="width: 308px; text-align: center;">XML Schema Data Type</TD>