diff --git a/en_US.ISO8859-1/books/porters-handbook/book.sgml b/en_US.ISO8859-1/books/porters-handbook/book.sgml
index ec4ca05415..53e695602c 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.sgml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.sgml
@@ -1619,7 +1619,7 @@ PORTEPOCH=      1</programlisting>
 
 	      <row>
 		<entry><filename>java</filename></entry>
-		<entry>Software related to the Java language.</entry>
+		<entry>Software related to the Java&trade; language.</entry>
 		<entry>The <filename>java</filename> category shall not be
 		  the only one for a port. Save for ports directly related to
 		  the Java language, porters are also encouraged not to
@@ -5929,7 +5929,7 @@ QT_COMPONENTS= qmake_build moc_build rcc_build uic_build</programlisting>
       <sect2 id="java-variables">
 	<title>Variable definitions</title>
 
-      <para>If your port needs a Java&trade; Development Kit (JDK) to
+      <para>If your port needs a Java&trade; Development Kit (JDK&trade;) to
 	either build, run or even extract the distfile, then it should
 	define <makevar>USE_JAVA</makevar>.</para>
 
diff --git a/en_US.ISO8859-1/share/sgml/trademarks.sgml b/en_US.ISO8859-1/share/sgml/trademarks.sgml
index 2118822b5d..54fc67f1f7 100644
--- a/en_US.ISO8859-1/share/sgml/trademarks.sgml
+++ b/en_US.ISO8859-1/share/sgml/trademarks.sgml
@@ -11,7 +11,8 @@
   <para>UNIX is a registered trademark of The Open Group in the US and
     other countries.</para>
 
-  <para>Sun, Sun Microsystems, SunOS, Solaris, and Java are trademarks
+  <para>Sun, Sun Microsystems, SunOS, Solaris,
+    Java, JDK, and OpenJDK are trademarks
     or registered trademarks of Sun Microsystems, Inc. in the United
     States and other countries.</para>