diff --git a/java/apache-commons-httpclient/Makefile b/java/apache-commons-httpclient/Makefile
index fcb964cfcfbd..4ca6b44aef3f 100644
--- a/java/apache-commons-httpclient/Makefile
+++ b/java/apache-commons-httpclient/Makefile
@@ -1,52 +1,47 @@
 PORTNAME=	commons-httpclient
 DISTVERSION=	3.1
 PORTREVISION=	3
 CATEGORIES=	java www
 MASTER_SITES=	APACHE/httpcomponents/${PORTNAME}/source
 PKGNAMEPREFIX=	apache-
 DISTNAME=	${PORTNAME}-${DISTVERSION}-src
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Package implementing the client side of the HTTP standard
 WWW=		https://hc.apache.org/httpclient-3.x/
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
 BUILD_DEPENDS+=	${JAVALIBDIR}/commons-codec.jar:java/apache-commons-codec
 RUN_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
 RUN_DEPENDS+=	${JAVALIBDIR}/commons-codec.jar:java/apache-commons-codec
 
 OPTIONS_DEFINE=	DOCS
 
 USES+=		cpe java:ant,run
 CPE_VENDOR=	apache
 
 MAKE_ENV=	ANT_INCLUDE_SHARED_JARS=YES
 NO_ARCH=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 ALL_TARGET=	dist
 
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
 
 PORTDOCS=	*
 
-post-patch:
-	@${REINPLACE_CMD} 's/Ortwin Gl.*ck/Ortwin Glueck/' \
-		${WRKSRC}/src/java/org/apache/commons/httpclient/*.java \
-		${WRKSRC}/src/java/org/apache/commons/httpclient/*/*.java
-
 do-install:
 	@${ECHO_MSG} -n ">> Installing JAR file as ${JAVAJARDIR}/${PORTNAME}.jar..."
 	@${INSTALL_DATA} ${WRKSRC}/dist/${PORTNAME}.jar ${STAGEDIR}${JAVAJARDIR}/
 	@${ECHO_MSG} " [DONE]"
 
 do-install-DOCS-on:
 	@${ECHO_MSG} -n ">> Installing documentation..."
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC}/dist/docs && ${FIND} api \
 	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1
 	@${ECHO_MSG} " [DONE]"
 
 .include <bsd.port.mk>
diff --git a/java/apache-commons-httpclient/files/patch-build.xml b/java/apache-commons-httpclient/files/patch-build.xml
index 98ba3dfbfef7..c1458323a02f 100644
--- a/java/apache-commons-httpclient/files/patch-build.xml
+++ b/java/apache-commons-httpclient/files/patch-build.xml
@@ -1,18 +1,46 @@
---- build.xml.orig	2007-10-28 09:00:18.000000000 +0100
-+++ build.xml	2007-10-28 09:00:37.000000000 +0100
-@@ -184,13 +184,13 @@
+--- build.xml.orig	2007-08-18 09:02:14 UTC
++++ build.xml
+@@ -179,24 +179,33 @@ -->
+           description="Compile shareable components">
+     <javac srcdir      ="${source.home}/java"
+            destdir     ="${build.home}/classes"
++           encoding    ="ISO-8859-1"
++           source      ="8"
++           target      ="8"
+            debug       ="${compile.debug}"
+            deprecation ="${compile.deprecation}"
             optimize    ="${compile.optimize}">
        <classpath refid="compile.classpath"/>
      </javac>
 -    <javac srcdir      ="${source.home}/examples"
 +    <!--javac srcdir      ="${source.home}/examples"
             destdir     ="${build.home}/examples"
++           encoding    ="ISO-8859-1"
++           source      ="8"
++           target      ="8"
             debug       ="${compile.debug}"
             deprecation ="${compile.deprecation}"
             optimize    ="${compile.optimize}">
        <classpath refid="compile.classpath"/>
 -    </javac>
 +    </javac-->
    </target>
  
    <target name="compile.tests" depends="compile"
+           description="Compile unit test cases">
+     <javac srcdir      ="${test.home}"
+            destdir     ="${build.home}/tests"
++           encoding    ="ISO-8859-1"
++           source      ="8"
++           target      ="8"
+            debug       ="${compile.debug}"
+            deprecation ="${compile.deprecation}"
+            optimize    ="${compile.optimize}">
+@@ -248,6 +257,7 @@ -->
+              doctitle     ="&lt;h1&gt;${component.title}&lt;/h1&gt;"
+              windowtitle  ="${component.title} (Version ${component.version})"
+              bottom       ="Copyright (c) 1999-2005 - Apache Software Foundation"
++             encoding     ="ISO-8859-1"
+     >
+       <classpath refid="test.classpath"/>
+       <link href="${javadoc.j2sdk.link}"/>