diff --git a/LEGAL b/LEGAL
index 5683eb25235c..bc59c7788541 100644
--- a/LEGAL
+++ b/LEGAL
@@ -380,7 +380,6 @@ lgrind/*		print/lgrind		Contains non-free code written by
 libdvdcss-*.tar.bz2	multimedia/libdvdcss	CSS code may violate the DMCA
 libidea-*		security/libidea	Crypto; export-controlled
 libots-*.alpha.rpm	lang/compaq-cc		Distribution not allowed
-LimeWireOther.zip	net-p2p/limewire	No redistribution allowed
 Linux-ACU-Driver-v*	sysutils/linux-acu	Redistribution not allowed
 Linux_MegaCli_*		sysutils/linux-megacli	Redistribution not allowed
 rpm/i386/fedora/4/gtk2-* x11-toolkits/linux-gtk2 LGPL binary, no source
diff --git a/net-p2p/limewire/Makefile b/net-p2p/limewire/Makefile
index 79396aea429b..d24db82efed6 100644
--- a/net-p2p/limewire/Makefile
+++ b/net-p2p/limewire/Makefile
@@ -6,53 +6,39 @@
 #
 
 PORTNAME=	limewire
-PORTVERSION=	4.12.13
+PORTVERSION=	4.12.11
+PORTEPOCH=	1
 CATEGORIES=	net-p2p java
-MASTER_SITES=	http://maverick.limewire.com/download/
+MASTER_SITES=	http://www10.limewire.com/download/
 DISTNAME=	LimeWireOther
 
 MAINTAINER=	armitage@smartwifi.com.ph
-COMMENT=	A Java based gnutella client
+COMMENT=	A Java based Gnutella client
 
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
-BROKEN=		Size mismatch
-
 USE_ZIP=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.3+
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/LimeWire
 
-RESTRICTED=	License does not allow redistribution of any kind
-
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
-DATAFILES=	LimeWire.jar MessagesBundles.jar ProgressTabs.jar \
-		clink.jar commons-httpclient.jar commons-logging.jar \
-		daap.jar i18n.jar icu4j.jar id3v2.jar jcraft.jar \
-		jdic.jar jl011.jar jmdns.jar log4j.jar \
-		looks.jar mp3sp14.jar themes.jar tritonus.jar \
-		vorbis.jar xerces.jar xml-apis.jar xml.war update.ver \
-		hashes libtray.so data.ser runLime.sh \
-		MessagesBundle.properties spacer.gif donotremove.htm \
-		root COPYING README.txt SOURCE \
-		commons-net.jar log4j.properties
 
-SUB_FILES=	limewire.sh
-PLIST_FILES=	bin/limewire
+SUB_FILES=	${PORTNAME}.sh
+
+post-extract:
+	@cd ${WRKSRC} && \
+		${RM} -f *.exe *.dll *.so *.sh cygwin.* COPYING SOURCE && \
+		${MV} README.txt ..
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/limewire.sh ${PREFIX}/bin/limewire
-	cd ${WRKSRC} \
-	  && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${DATADIR}/{} \;
-	cd ${WRKSRC} \
-	  && ${FIND} ${DATAFILES} -type f -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
-
-post-install:
-	@cd ${WRKSRC} \
-	  && ${FIND} -s ${DATAFILES} -type f | ${SED} 's,^,${DATADIR:S,^${PREFIX}/,,}/,' >>${TMPPLIST}
-	@cd ${WRKSRC} \
-	  && ${FIND} -s -d ${DATAFILES} -type d | ${SED} 's,^,@dirrm ${DATADIR:S,^${PREFIX}/,,}/,' >>${TMPPLIST}
-	@${ECHO_CMD} "@dirrm ${DATADIR:S,^${PREFIX}/,,}" >>${TMPPLIST}
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME}
+	${MKDIR} ${DATADIR}
+	${CP} -R ${WRKSRC}/* ${DATADIR}
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/README.txt ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/net-p2p/limewire/distinfo b/net-p2p/limewire/distinfo
index fd3775cbaa4d..7ecf8fb18e0e 100644
--- a/net-p2p/limewire/distinfo
+++ b/net-p2p/limewire/distinfo
@@ -1,3 +1,3 @@
-MD5 (LimeWireOther.zip) = 4b2c2f228205f6277170bacfb152305d
-SHA256 (LimeWireOther.zip) = e72fb5aca3edd580d28772b3985196e2d6dcb5b4b833c90d09c9d7adf69c1237
-SIZE (LimeWireOther.zip) = 6665140
+MD5 (LimeWireOther.zip) = f6d3c2e3f8b732fca75208b39b3d5a9f
+SHA256 (LimeWireOther.zip) = b80a06e4b133971e8354fe4dbe3d460b2ed482ede2618c91d42d82fae27aeb16
+SIZE (LimeWireOther.zip) = 8902576
diff --git a/net-p2p/limewire/files/limewire.sh.in b/net-p2p/limewire/files/limewire.sh.in
index 81864b7a3d4a..09b8b01dc6e3 100644
--- a/net-p2p/limewire/files/limewire.sh.in
+++ b/net-p2p/limewire/files/limewire.sh.in
@@ -5,4 +5,4 @@
 export J2SE_PREEMPTCLOSE=1
 export JAVA_VERSION="1.3+"
 
-cd "%%DATADIR%%" && "%%LOCALBASE%%/bin/java" -jar LimeWire.jar
+cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -jar LimeWire.jar "$@"
diff --git a/net-p2p/limewire/pkg-plist b/net-p2p/limewire/pkg-plist
new file mode 100644
index 000000000000..d9ebbb2ca306
--- /dev/null
+++ b/net-p2p/limewire/pkg-plist
@@ -0,0 +1,44 @@
+bin/limewire
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%DATADIR%%/LimeWire.ico
+%%DATADIR%%/LimeWire.jar
+%%DATADIR%%/MessagesBundle.properties
+%%DATADIR%%/MessagesBundles.jar
+%%DATADIR%%/ProgressTabs.jar
+%%DATADIR%%/clink.jar
+%%DATADIR%%/commons-httpclient.jar
+%%DATADIR%%/commons-logging.jar
+%%DATADIR%%/commons-net.jar
+%%DATADIR%%/daap.jar
+%%DATADIR%%/data.ser
+%%DATADIR%%/donotremove.htm
+%%DATADIR%%/hashes
+%%DATADIR%%/i18n.jar
+%%DATADIR%%/icu4j.jar
+%%DATADIR%%/id3v2.jar
+%%DATADIR%%/jcraft.jar
+%%DATADIR%%/jdic.jar
+%%DATADIR%%/jl011.jar
+%%DATADIR%%/jmdns.jar
+%%DATADIR%%/log4j.jar
+%%DATADIR%%/log4j.properties
+%%DATADIR%%/looks.jar
+%%DATADIR%%/mp3sp14.jar
+%%DATADIR%%/pmf.ico
+%%DATADIR%%/root/magnet10/badge.img
+%%DATADIR%%/root/magnet10/canHandle.img
+%%DATADIR%%/root/magnet10/limewire.gif
+%%DATADIR%%/root/magnet10/options.js
+%%DATADIR%%/root/magnet10/silentdetect.js
+%%DATADIR%%/spacer.gif
+%%DATADIR%%/themes.jar
+%%DATADIR%%/tritonus.jar
+%%DATADIR%%/update.ver
+%%DATADIR%%/vorbis.jar
+%%DATADIR%%/xerces.jar
+%%DATADIR%%/xml-apis.jar
+%%DATADIR%%/xml.war
+@dirrm %%DATADIR%%/root/magnet10
+@dirrm %%DATADIR%%/root
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%