diff --git a/devel/umlgraph/Makefile b/devel/umlgraph/Makefile
index c7a9e57bc438..b3b27f9c0923 100644
--- a/devel/umlgraph/Makefile
+++ b/devel/umlgraph/Makefile
@@ -2,22 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	umlgraph
-PORTVERSION=	5.6
-PORTREVISION=	1
+PORTVERSION=	5.7.2
 CATEGORIES=	devel java
-MASTER_SITES=	http://www.umlgraph.org/
-DISTNAME=	UMLGraph-${PORTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	https://github.com/dspinellis/UMLGraph/archive/
+DISTNAME=	R${PORTVERSION:S/./_/g}
 
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Automated drawing of UML diagrams
 
 LICENSE=	BSD3CLAUSE
 
-WRKSRC=		${WRKDIR}/${DISTNAME}
+WRKSRC=		${WRKDIR}/UMLGraph-${DISTNAME}
 USE_ANT=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
+JAVA_VERSION=	1.8
 
 BUILD_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz \
 		pic2plot:${PORTSDIR}/graphics/plotutils
@@ -25,20 +23,14 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_FILES=	bin/umlgraph %%JAVAJARDIR%%/UmlGraph.jar
 
-.include <bsd.port.pre.mk>
-
-.if ${JAVA_PORT_VERSION:M1.8.*}
-EXTRA_PATCHES=  ${PATCHDIR}/extra-patch-src_org_umlgraph_doclet_WrappedClassDoc.java
-.endif
-
 post-configure:
 	${REINPLACE_CMD} -e 's|%%JAVA_HOME%%|${JAVA_HOME}|; \
 		s|%%JAVAJARDIR%%|${JAVAJARDIR}|' \
-		${WRKSRC}/bin/umlgraph
+		${WRKSRC}/umlgraph
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/UmlGraph.jar ${STAGEDIR}${JAVAJARDIR}/
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/umlgraph ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/umlgraph ${STAGEDIR}${PREFIX}/bin
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/umlgraph/distinfo b/devel/umlgraph/distinfo
index 616cb6f2bcaf..f56ec3bca93c 100644
--- a/devel/umlgraph/distinfo
+++ b/devel/umlgraph/distinfo
@@ -1,2 +1,2 @@
-SHA256 (UMLGraph-5.6.tar.gz) = bd17dcd8074e03c3a2f08f0ccf81ec149904ab365cbeae254629c4a277740d59
-SIZE (UMLGraph-5.6.tar.gz) = 3718510
+SHA256 (R5_7_2.tar.gz) = b4b0c6236c792d9d4d75265c19f3021a7224d388c8995d06cf60785c8eebf22f
+SIZE (R5_7_2.tar.gz) = 3200282
diff --git a/devel/umlgraph/files/extra-patch-src_org_umlgraph_doclet_WrappedClassDoc.java b/devel/umlgraph/files/extra-patch-src_org_umlgraph_doclet_WrappedClassDoc.java
deleted file mode 100644
index 39a2cb522406..000000000000
--- a/devel/umlgraph/files/extra-patch-src_org_umlgraph_doclet_WrappedClassDoc.java
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/org/umlgraph/doclet/WrappedClassDoc.java.orig	2012-04-25 08:57:52 UTC
-+++ src/org/umlgraph/doclet/WrappedClassDoc.java
-@@ -20,6 +20,7 @@
- 
- package org.umlgraph.doclet;
- 
-+import com.sun.javadoc.AnnotatedType;
- import com.sun.javadoc.AnnotationDesc;
- import com.sun.javadoc.AnnotationTypeDoc;
- import com.sun.javadoc.ClassDoc;
-@@ -359,4 +360,11 @@ public class WrappedClassDoc implements 
- 	return wrapped.typeParamTags();
-     }
- 
-+    public AnnotatedType asAnnotatedType() {
-+	return wrapped.asAnnotatedType();
-+    }
-+
-+    public Type getElementType() {
-+	return wrapped.getElementType();
-+    }
- }
diff --git a/devel/umlgraph/files/patch-umlgraph b/devel/umlgraph/files/patch-umlgraph
index 0b11a26f8484..7cd1f0bc9dbe 100644
--- a/devel/umlgraph/files/patch-umlgraph
+++ b/devel/umlgraph/files/patch-umlgraph
@@ -1,6 +1,6 @@
---- bin/umlgraph.orig	2011-01-09 02:38:50.000000000 +0800
-+++ bin/umlgraph	2011-02-14 18:43:16.000000000 +0800
-@@ -19,7 +19,7 @@
+--- umlgraph.orig	2015-10-04 22:55:25.647816000 +0800
++++ umlgraph	2015-10-04 22:56:10.202755000 +0800
+@@ -18,7 +18,7 @@
  	BASE=$1
  	FILETYPE=$2
  	shift 2