diff --git a/math/apache-commons-math/Makefile b/math/apache-commons-math/Makefile
index 59e38cc39ec5..2939cf7ac7dc 100644
--- a/math/apache-commons-math/Makefile
+++ b/math/apache-commons-math/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	commons-math
 PORTVERSION=	3.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math java
 MASTER_SITES=	APACHE_COMMONS_SOURCE \
 		https://repo1.maven.org/maven2/junit/junit/4.8.2/:source2
 PKGNAMEPREFIX=	apache-
 DISTNAME=	${PORTNAME}3-${PORTVERSION}-src
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		junit-4.8.2.jar:source2
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Java library of self-contained mathematics and statistics components
 WWW=		https://commons.apache.org/proper/commons-math/
 
 LICENSE=	APACHE20
 
 BROKEN_armv6=		fails to compile: build.xml: Compile failed; see the compiler error output for details
 BROKEN_armv7=		fails to compile: PowellOptimizer.java:301: error: Illegal static declaration in inner class PowellOptimizer.LineSearch
 
 USE_ANT=	yes
 USE_JAVA=	yes
 USE_LOCALE=	en_US.ISO8859-1
 
-ALL_TARGET=	jar
+ALL_TARGET=	compile jar
 MAKE_ARGS=	-Dlibdir=${WRKDIR} -Dnoget=true
 
 JARFILE=	${PORTNAME:S,3,,}-3.6.jar
 DESTJARFILE=	${PORTNAME}.jar
 PLIST_FILES+=	${JAVAJARDIR}/${DESTJARFILE}
 
 OPTIONS_DEFINE=	DOCS
 
 NO_ARCH=	yes
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 ALL_TARGET+=	javadoc
 PORTDOCS=	LICENSE.txt NOTICE.txt RELEASE-NOTES.txt license-header.txt
 .endif
 
 post-extract:
 	${MKDIR} ${WRKSRC}/lib
 	${CP} ${DISTDIR}/junit-4.8.2.jar ${WRKSRC}/lib/
 
 do-install:
 	${MKDIR} ${STAGEDIR}${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKSRC}/target/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE}
 
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/apache-commons-math/files/patch-build.xml b/math/apache-commons-math/files/patch-build.xml
index 256c8c63f281..57ce05cc8e36 100644
--- a/math/apache-commons-math/files/patch-build.xml
+++ b/math/apache-commons-math/files/patch-build.xml
@@ -1,60 +1,71 @@
 --- build.xml.orig	2016-03-17 12:14:52 UTC
 +++ build.xml
+@@ -100,8 +100,8 @@
+   <property name="source.encoding"         value="UTF-8"/>
+     
+   <!-- JDK level -->
+-  <property name="compile.source"          value="1.5"/>
+-  <property name="compile.target"          value="1.5"/>
++  <property name="compile.source"          value="8"/>
++  <property name="compile.target"          value="8"/>
+ 
+   <!-- Base compile classpath -->
+   <path id="compile.classpath">
 @@ -174,7 +174,7 @@
  
  <!-- ========== Unit Test Targets ========================================= -->
  
 -    <target name="compile.tests" depends="compile, download-dependencies" description="Compile unit tests.">
 +    <target name="compile.tests" depends="compile" description="Compile unit tests.">
  
        <javac srcdir="${test.home}"
               destdir="${build.home}/test-classes"
 @@ -256,7 +256,7 @@
  
  <!-- ========== Create Jar ================================================ -->
  
 -  <target name="jar" depends="test" description="Create jar file">
 +  <target name="jar" description="Create jar file">
  
      <copy file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
      <copy file="NOTICE.txt"  tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
 @@ -339,38 +339,11 @@
  
  <!-- ========== Gump Target ===================================================== -->
  
 -  <target name="gump" depends="clean,test,javadoc,jar" description="Gump Target - clean,test,javadoc,jar"/>
 +  <target name="gump" depends="clean,javadoc,jar" description="Gump Target - clean,test,javadoc,jar"/>
  
  
  <!-- ========== Download Dependencies =========================================== -->
  
 -    <target name="download-dependencies" 
 -         depends="check-availability" unless="skip.download">
 -        <echo message="doing download-dependencies..." />
 -        <antcall target="download-junit" />
 -        <antcall target="download-hamcrest" />
 -    </target>
 -
 -    <target name="check-availability">
 -        <echo message="doing check-availability..." />
 -        <available file="${junit.jar}" property="junit.found"/>
 -    </target>
 -
 -    <target name="download-junit" unless="junit.found">
 -        <echo message="Downloading junit..."/>
 -        <mkdir dir="${download.lib.dir}" />
 -        <get dest="${download.lib.dir}/junit-${junit.version}.jar"
 -            usetimestamp="true" ignoreerrors="true"
 -            src="http://repo1.maven.org/maven2/junit/junit/${junit.version}/junit-${junit.version}.jar"/>
 -    </target>
 -
 -	<target name="download-hamcrest" unless="hamcrest.found">
 -	        <echo message="Downloading hamcrest..."/>
 -	        <mkdir dir="${download.lib.dir}" />
 -	        <get dest="${download.lib.dir}/${hamcrest.jar}"
 -	            usetimestamp="true" ignoreerrors="true"
 -	            src="http://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
 -	</target>
        
  </project>