diff --git a/misc/freeguide/Makefile b/misc/freeguide/Makefile
index 91a474975e8f..fe669e970f78 100644
--- a/misc/freeguide/Makefile
+++ b/misc/freeguide/Makefile
@@ -1,40 +1,39 @@
 PORTNAME=	freeguide
 PORTVERSION=	0.11.1
 PORTREVISION=	2
 CATEGORIES=	misc java
 MASTER_SITES=	SF/${PORTNAME}-tv/${PORTNAME}-source/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Interactive TV guide which will create personalized TV listings
 WWW=		http://freeguide-tv.sf.net/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/doc/COPYING
 
 RUN_DEPENDS=	tv_cat:textproc/p5-xmltv
 
 USES=		java:ant,run
-JAVA_VERSION=	8
 
 NO_ARCH=	yes
 
 MAKE_ARGS=	-Dinstall_share_dir=${STAGEDIR}${PREFIX}/share \
 		-Dinstall_man1_dir=${STAGEDIR}${PREFIX}/share \
 		-Dinstall_java_bin=${JAVA} \
 		-Dinstall_real_doc_dir=${DOCSDIR} \
 		-Dinstall_bin_dir=${STAGEDIR}${PREFIX}/bin \
 		-Dinstall_doc_dir=${STAGEDIR}${DOCSDIR} \
 		-Dinstall_java_share_dir=${STAGEDIR}${JAVASHAREDIR} \
 		-Dinstall_jar_dir=${STAGEDIR}${JAVAJARDIR}/freeguide
 INSTALL_TARGET=	install
 
 post-patch:
 	@${REINPLACE_CMD} 's|__ANT_INSTALL_DIRECTORY__|${JAVAJARDIR}/freeguide|; \
 		s|=java|=${JAVA}|;' \
 		${WRKSRC}/install/linux/freeguide
 
 do-install:
 	@(cd ${BUILD_WRKSRC} && \
 		${ANT} ${MAKE_ARGS} ${INSTALL_TARGET})
 
 .include <bsd.port.mk>
diff --git a/misc/freeguide/files/patch-build.xml b/misc/freeguide/files/patch-build.xml
index 68f88b8961fe..633c29a67ae3 100644
--- a/misc/freeguide/files/patch-build.xml
+++ b/misc/freeguide/files/patch-build.xml
@@ -1,13 +1,31 @@
 --- build.xml.orig	2014-10-22 19:25:23 UTC
 +++ build.xml
-@@ -200,8 +200,8 @@
+@@ -62,8 +62,6 @@
+             description="Update version numbers etc. in source code.">
+         <mkdir dir="${bin}"/>
+         <javac
+-            source="1.5"
+-            target="1.5"
+             destdir="${bin}">
+             <src path="${src}/freeguide/build"/>
+             <src path="${src}/freeguide/common/base"/>
+@@ -80,8 +78,6 @@
+         <javac srcdir="${src}"
+             destdir="${bin}"
+             deprecation="on"
+-            source="1.5"
+-            target="1.5"
+             debug="yes"
+             encoding="UTF-8">
+             <!--compilerarg value="-Xlint:unchecked"/-->
+@@ -200,8 +196,8 @@
          <mkdir dir="${install_share_dir}/applications" />
          <copy file="${install}/linux/freeguide.desktop" todir="${install_share_dir}/applications/" />
  
 -        <mkdir dir="${install_share_dir}/man/man1" />
 -        <gzip src="${install-bin}/linux/freeguide.1" destfile="${install_share_dir}/man/man1/freeguide.1.gz"/>
 +        <mkdir dir="${install_man1_dir}/man/man1" />
 +        <gzip src="${install-bin}/linux/freeguide.1" destfile="${install_man1_dir}/man/man1/freeguide.1.gz"/>
  
          <mkdir dir="${install_share_dir}/doc/freeguide" />
          <copy todir="${install_share_dir}/doc/freeguide/">