diff --git a/graphics/jogl/Makefile b/graphics/jogl/Makefile
index c9fae26869e8..590c79175634 100644
--- a/graphics/jogl/Makefile
+++ b/graphics/jogl/Makefile
@@ -52,13 +52,22 @@ ALL_TARGET+=	javadoc
 
 .include <bsd.port.pre.mk>
 
-.if ${JAVA_PORT_VERSION} == "1.6.0"
+.if ${JAVA_PORT_VERSION:M1.6.*}
 PLIST_SUB+=	JDK6=""
 PLIST_SUB+=	JDK7="@comment "
-.else
+.endif
+.if ${JAVA_PORT_VERSION:M1.7.*}
 PLIST_SUB+=	JDK6="@comment "
 PLIST_SUB+=	JDK7=""
 .endif
+.if ${JAVA_PORT_VERSION:M1.8.*}
+PLIST_SUB+=	JDK6="@comment "
+PLIST_SUB+=	JDK7="@comment "
+.endif
+
+.if ${JAVA_PORT_VERSION:M1.8.*}
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-build.xml
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|g' \
diff --git a/graphics/jogl/files/extra-patch-build.xml b/graphics/jogl/files/extra-patch-build.xml
new file mode 100644
index 000000000000..2f69144ad9f7
--- /dev/null
+++ b/graphics/jogl/files/extra-patch-build.xml
@@ -0,0 +1,10 @@
+--- jogl/make/build.xml.orig	2015-10-01 22:40:34.563042000 +0000
++++ jogl/make/build.xml	2015-10-01 22:40:53.793693000 +0000
+@@ -1058,6 +1058,7 @@
+                  sourcepath="${src.java};${src.generated.java}"        
+                  destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
+                  overview="${javadoc.overview}" 
++                 additionalparam="-Xdoclint:none"
+                  source="1.4"
+                  linkoffline="${javadoc.link} 142-packages"
+ 		 bottom="${javadoc.bottom}" >