diff --git a/java/java-cup/Makefile b/java/java-cup/Makefile
index e5ae9b159f4c..113ea6fd0354 100644
--- a/java/java-cup/Makefile
+++ b/java/java-cup/Makefile
@@ -5,42 +5,28 @@
 # $FreeBSD$
 #
 
-PORTNAME=	java_cup
-PORTVERSION=	10.k
-CATEGORIES=	java
-MASTER_SITES=	http://www.cs.princeton.edu/~appel/modern/java/CUP/
-DISTNAME=	${PORTNAME}_v${PORTVERSION:S|.||}
+PORTNAME=	cup
+PORTVERSION=	11.a
+CATEGORIES=	java devel
+MASTER_SITES=	http://www2.cs.tum.edu/projects/cup/
+PKGNAMEPREFIX=	java-
+DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-v${PORTVERSION:S|.||}-20050516-sources
 
-MAINTAINER=	nordwick@xcf.berkeley.edu
+MAINTAINER=	ports@mcdermottroe.com
 COMMENT=	An LALR parser generator in Java
 
-USE_JAVA=	1.1+
-NEED_JAVAC=	yes
-NO_WRKSUBDIR=	yes
+USE_JAVA=	yes
+USE_ANT=	yes
+WRKSRC=		${WRKDIR}/cup-tum
 
-PLIST_SUB=	JAVAJARDIR=${JAVAJARDIR:S|^${PREFIX}/||} PORTNAME=${PORTNAME}
+# Silly hack because the naming in CUP is all over the place
+DISTJARNAME=	${PKGNAMEPREFIX}${PORTNAME}-10k-TUM
 
-do-build:
-	${SETENV} CLASSPATH=${WRKSRC} ${JAVAC} ${WRKSRC}/java_cup/*.java \
-		${WRKSRC}/java_cup/runtime/*.java
-	cd ${WRKSRC} && \
-		${JAR} cf ${PORTNAME}.jar java_cup/*.class \
-		java_cup/runtime/*.class
+PLIST_FILES=	%%JAVAJARDIR%%/${DISTJARNAME}.jar \
+		%%JAVAJARDIR%%/${DISTJARNAME}-runtime.jar
 
 do-install:
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.jar ${JAVAJARDIR}
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/manual.html ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/cup_logo.gif ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
-	@${ECHO_MSG} "Documentation installed in ${DOCSDIR}"
-	@${ECHO_MSG} "   manual.html --  How to build a grammar."
-	@${ECHO_MSG} "   README -- How to get it working."
-	@${ECHO_MSG} "   LICENSE -- How not to get sued."
-.endif
+	${INSTALL_DATA} ${WRKSRC}/dist/${DISTJARNAME}.jar ${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKSRC}/dist/${DISTJARNAME}-runtime.jar ${JAVAJARDIR}
 
 .include <bsd.port.mk>
diff --git a/java/java-cup/distinfo b/java/java-cup/distinfo
index b55c55978a91..be4f83d116c7 100644
--- a/java/java-cup/distinfo
+++ b/java/java-cup/distinfo
@@ -1,2 +1,2 @@
-MD5 (java_cup_v10k.tar.gz) = 8b11edfec13c590ea443d0f0ae0da479
-SIZE (java_cup_v10k.tar.gz) = 190843
+MD5 (java-cup-v11a-20050516-sources.tar.gz) = c8fc4d67475ca62da079e8c9f8973aa4
+SIZE (java-cup-v11a-20050516-sources.tar.gz) = 362129
diff --git a/java/java-cup/pkg-plist b/java/java-cup/pkg-plist
deleted file mode 100644
index 4d37b68a5975..000000000000
--- a/java/java-cup/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-%%JAVAJARDIR%%/%%PORTNAME%%.jar
-%%PORTDOCS%%%%DOCSDIR%%/manual.html
-%%PORTDOCS%%%%DOCSDIR%%/cup_logo.gif
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%@dirrm %%DOCSDIR%%