diff --git a/games/kye/Makefile b/games/kye/Makefile
index 0b1c297882d2..6d3d5cee0a5c 100644
--- a/games/kye/Makefile
+++ b/games/kye/Makefile
@@ -1,16 +1,20 @@
-# New Ports collection makefile for:	kye
-# Date created:		17 July 2012
-# Whom:			nemysis@gmx.ch
-#
+# Created By: nemysis@gmx.ch
 # $FreeBSD$
-#
 
 PORTNAME=	kye
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games python
-MASTER_SITES=	http://games.moria.org.uk/kye/download/
+MASTER_SITES=	http://games.moria.org.uk/kye/download/ \
+		SF/nemysisfreebsdp/kye/:nemysis
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+# Selection of production-ready/well-known Kye Levels
+# (ziped Levels already included from games.moria.org.uk are excluded)
+# Please contact the MAINTAINER if a Level is missing
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		kye-data_moria_levels.20121101.tar.gz:nemysis \
+		kye-data_nuke_levels.20121101.tar.gz:nemysis \
+		kye-data_extra_levels.20120818.tar.gz:nemysis
 DIST_SUBDIR=	kye
 
 MAINTAINER=	nemysis@gmx.ch
@@ -23,26 +27,32 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 NO_BUILD=	yes
 
+PORTDATA=	*
 PORTDOCS=	NEWS README
 
 SUB_FILES=	pkg-message
 
+DESKTOP_ENTRIES="Python Kye" "${COMMENT}" "Kye" \
+		"Kye" "Game;LogicGame;" ${FALSE}
+
 .include <bsd.port.options.mk>
 
+post-extract-script:
+	${MKDIR} ${WRKDIR}/${PORTNAME}
+.for l in kye-data_moria_levels.20121101.tar.gz kye-data_nuke_levels.20121101.tar.gz kye-data_extra_levels.20120818.tar.gz
+	${TAR} xfjp ${DISTDIR}/${DIST_SUBDIR}/${l} -C ${WRKDIR}/${PORTNAME}
+.endfor
+
 post-install:
-# Data
 	${INSTALL_DATA} ${WRKSRC}/kye-icon.png ${PREFIX}/share/pixmaps/Kye.png
 	${INSTALL_DATA} ${WRKSRC}/kye-edit-icon.png ${PREFIX}/share/pixmaps/Kye-edit.png
+	@cd ${WRKDIR}/${PORTNAME} && ${COPYTREE_SHARE} \* ${DATADIR}
 
-# Documentation
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
-.  for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.  endfor
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
-# pkg-message
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
diff --git a/games/kye/distinfo b/games/kye/distinfo
index 9be8bcdb779e..96ec313b02d7 100644
--- a/games/kye/distinfo
+++ b/games/kye/distinfo
@@ -1,2 +1,8 @@
 SHA256 (kye/kye-1.0.tar.gz) = d58a9e62a0ec736a072a932603cdc5b3f4890b28c32c346639513d4e247ca747
 SIZE (kye/kye-1.0.tar.gz) = 55245
+SHA256 (kye/kye-data_moria_levels.20121101.tar.gz) = 2c96f8e4146df5144aa97dd050c248240671df3533619b924c17e21bbc2de5fe
+SIZE (kye/kye-data_moria_levels.20121101.tar.gz) = 51200
+SHA256 (kye/kye-data_nuke_levels.20121101.tar.gz) = 9ccd96ded14cc5907fcb417a7219e9a5e11e3dc8f0a9c1fd049e0b4bd5523769
+SIZE (kye/kye-data_nuke_levels.20121101.tar.gz) = 294912
+SHA256 (kye/kye-data_extra_levels.20120818.tar.gz) = 9ddee7e21607c7fe425f24d7aa71e7120c29e885320eb2ed880b0f5a882ea5e4
+SIZE (kye/kye-data_extra_levels.20120818.tar.gz) = 455680
diff --git a/games/kye/files/pkg-message.in b/games/kye/files/pkg-message.in
index e411e0cd685a..cad168018ba0 100644
--- a/games/kye/files/pkg-message.in
+++ b/games/kye/files/pkg-message.in
@@ -4,10 +4,7 @@ Python Kye has been installed.
 
 This package does not include all Python Kye Levels.
 
-To obtain the original extra Levels use the "games/kye-data" Port.
-
-
-In addition, you can search for additional extra Levels here:
+You can search for additional extra Levels here:
 
     http://kye.8m.com/gfclevels.html
 
diff --git a/games/kye/pkg-descr b/games/kye/pkg-descr
index 1e87e2276932..1b3ac458f6b8 100644
--- a/games/kye/pkg-descr
+++ b/games/kye/pkg-descr
@@ -9,3 +9,5 @@ work on any system with working Python and pygtk. It works on Windows as well,
 for instance.
 
 WWW: http://games.moria.org.uk/kye/
+WWW: http://www.nuke.demon.co.uk/kye/levels/
+WWW: https://sourceforge.net/projects/nemysisfreebsdp/files/kye/
diff --git a/games/kye/pkg-plist b/games/kye/pkg-plist
index 419df4d00024..0bcdee8a66b3 100644
--- a/games/kye/pkg-plist
+++ b/games/kye/pkg-plist
@@ -42,13 +42,8 @@ bin/Kye-edit
 %%PYTHON_SITELIBDIR%%/kye/stbar.py
 %%PYTHON_SITELIBDIR%%/kye/stbar.pyc
 %%PYTHON_SITELIBDIR%%/kye/stbar.pyo
-%%DATADIR%%/images.tar.gz
-%%DATADIR%%/intro.kye
-%%DATADIR%%/quests.kye
-%%DATADIR%%/template.kye
 share/pixmaps/Kye-edit.png
 share/pixmaps/Kye.png
-@dirrmtry %%DATADIR%%
-@dirrmtry %%PYTHON_SITELIBDIR%%/kye
+@dirrm %%PYTHON_SITELIBDIR%%/kye
 @dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrmtry %%PYTHON_LIBDIR%%
+@dirrmtry lib/python2.7