diff --git a/games/singularity/Makefile b/games/singularity/Makefile
index ab7d74c2cb7..9247cb3a5f5 100644
--- a/games/singularity/Makefile
+++ b/games/singularity/Makefile
@@ -1,12 +1,14 @@
-# $OpenBSD: Makefile,v 1.2 2007/10/08 08:22:41 steven Exp $
+# $OpenBSD: Makefile,v 1.3 2008/04/18 18:17:37 ajacoutot Exp $
 
 COMMENT=	simulation of a true AI
 
-V=		0.26a
+V=		0.27
 DISTNAME=	singularity_${V}
-PKGNAME=	singularity-${V}p0
+PKGNAME=	singularity-${V}
 CATEGORIES=	games
 
+MODPY_EGG_VERSION=	${V}
+
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		endgame-singularity-music-001.zip
 
@@ -14,7 +16,7 @@ HOMEPAGE=	http://emhsoft.com/singularity/
 
 MAINTAINER=	Antoine Jacoutot <ajacoutot@openbsd.org>
 
-# GPL
+# GPLv2
 # music under CC Attribution-ShareAlike 3.0 Unported
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -36,13 +38,13 @@ pre-configure:
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/singularity
 	${INSTALL_DATA_DIR} ${PREFIX}/share/singularity/music
-	${INSTALL_DATA} ${WRKSRC}/data/*.{ttf,png,txt,wav,jpg} \
-		${PREFIX}/share/singularity/
-	${INSTALL_DATA} ${WRKSRC}/data/*.html ${PREFIX}/share/doc/singularity
-	${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/singularity
+	cp -r ${WRKSRC}/data/* ${PREFIX}/share/singularity
+	mv ${PREFIX}/share/singularity/*.html \
+		${PREFIX}/share/doc/singularity
 	${INSTALL_DATA} ${WRKDIR}/endgame-singularity-music-001/music/*.ogg \
 		${PREFIX}/share/singularity/music
 	${INSTALL_SCRIPT} ${FILESDIR}/singularity ${PREFIX}/bin/singularity
+	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/singularity
 	@perl -pi -e 's,##MODPY_BIN##,${MODPY_BIN},g' ${PREFIX}/bin/singularity
 
 .include <bsd.port.mk>
diff --git a/games/singularity/distinfo b/games/singularity/distinfo
index 83037b3e220..284c9513e23 100644
--- a/games/singularity/distinfo
+++ b/games/singularity/distinfo
@@ -1,10 +1,10 @@
 MD5 (endgame-singularity-music-001.zip) = zZrX/BZGTrKuv9Acsl0RXA==
-MD5 (singularity_0.26a.tar.gz) = y+FjlcIGvWBUlEI+4IXanA==
+MD5 (singularity_0.27.tar.gz) = iaYCsKHABGPn9FToubJAZw==
 RMD160 (endgame-singularity-music-001.zip) = 4u5H1v3l2kiCWmGYr40aT8j8xYU=
-RMD160 (singularity_0.26a.tar.gz) = gkHNXMjR7G5EnjUfT30GtaKyQ/w=
+RMD160 (singularity_0.27.tar.gz) = wagv5XfvlUPOyQ2dmij9IablT5Y=
 SHA1 (endgame-singularity-music-001.zip) = /hEs1nl090ABX5ItdbO13uKKyNo=
-SHA1 (singularity_0.26a.tar.gz) = VHckydb1y/bzlTAAirtVKXQ/pBg=
+SHA1 (singularity_0.27.tar.gz) = GCZl21aX67a5hjKtIa1JceWY+4k=
 SHA256 (endgame-singularity-music-001.zip) = 8NaL7rrFlyUpMPxFjRk4G1gGIm8zszjklfSvC5QHqLY=
-SHA256 (singularity_0.26a.tar.gz) = PUV655PC3IA4fJ8VSML7MjKuyVxlC7hAHZEH2+62AdQ=
+SHA256 (singularity_0.27.tar.gz) = 8gbDvKzksQou6DmlL8NEiY2chim8oOrgZ2ur0+/85x0=
 SIZE (endgame-singularity-music-001.zip) = 23997713
-SIZE (singularity_0.26a.tar.gz) = 1262046
+SIZE (singularity_0.27.tar.gz) = 1233069
diff --git a/games/singularity/patches/patch-code_g_py b/games/singularity/patches/patch-code_g_py
index 53aca6158c9..8e8da356a2c 100644
--- a/games/singularity/patches/patch-code_g_py
+++ b/games/singularity/patches/patch-code_g_py
@@ -1,28 +1,28 @@
-$OpenBSD: patch-code_g_py,v 1.1.1.1 2007/08/31 06:23:37 ajacoutot Exp $
---- code/g.py.orig	Mon Aug 13 05:32:26 2007
-+++ code/g.py	Thu Aug 30 13:17:50 2007
-@@ -71,7 +71,7 @@ font0 = "vera.ttf"
+$OpenBSD: patch-code_g_py,v 1.2 2008/04/18 18:17:38 ajacoutot Exp $
+--- code/g.py.orig	Fri Apr 18 19:52:27 2008
++++ code/g.py	Fri Apr 18 19:53:49 2008
+@@ -64,7 +64,7 @@ default_savegame_name = "Default Save"
+ font0 = "vera.ttf"
  font1 = "acknowtt.ttf"
  
- global data_loc
 -data_loc = "../data/"
 +data_loc = "!!PREFIX!!/share/singularity/"
  
  def quit_game():
      sys.exit()
-@@ -141,7 +141,7 @@ def load_music():
-     global musicarraylen
-     musicarray = []
-     musicarraylen=0
--    musicpath=path.join(data_loc, "..", "music")
-+    musicpath=path.join(data_loc, "music")
-     if not path.isdir(musicpath):
-         makedirs(musicpath)
-     temp_ls = listdir(musicpath)
-@@ -990,7 +990,7 @@ def fix_data_dir():
+@@ -203,7 +203,7 @@ load_music() loads music for the game.  It looks in mu
+ 
+     # Build the set of paths we'll check for music.
+     music_paths = (
+-        os.path.join(data_loc, "..", "music"),
++        os.path.join(data_loc, "music"),
+         os.path.join(get_save_folder(True), "music")
+     )
+     for music_path in music_paths:
+@@ -1085,7 +1085,7 @@ def fix_data_dir():
      global data_loc
-     if path.exists(data_loc): return
-     elif path.exists("data"):
+     if os.path.exists(data_loc): return
+     elif os.path.exists("data"):
 -        data_loc = "data/"
 +        data_loc = "!!PREFIX!!/share/singularity/"
          return
diff --git a/games/singularity/patches/patch-setup_py b/games/singularity/patches/patch-setup_py
index 83ef61efe0f..53bfc94c0df 100644
--- a/games/singularity/patches/patch-setup_py
+++ b/games/singularity/patches/patch-setup_py
@@ -1,6 +1,6 @@
-$OpenBSD: patch-setup_py,v 1.1.1.1 2007/08/31 06:23:37 ajacoutot Exp $
---- setup.py.orig	Mon Aug 13 05:32:27 2007
-+++ setup.py	Thu Aug 30 13:00:00 2007
+$OpenBSD: patch-setup_py,v 1.2 2008/04/18 18:17:38 ajacoutot Exp $
+--- setup.py.orig	Fri Apr 18 06:02:36 2008
++++ setup.py	Fri Apr 18 19:54:13 2008
 @@ -1,8 +1,7 @@
  # setup.py
  from distutils.core import setup
@@ -9,5 +9,5 @@ $OpenBSD: patch-setup_py,v 1.1.1.1 2007/08/31 06:23:37 ajacoutot Exp $
 -setup(console=["singularity.py"],
 +setup(packages=["singularity"],
        name="Endgame Singularity",
- 	version="0.26a",
+ 	version="0.27",
  	description="A simulation of a true AI",
diff --git a/games/singularity/pkg/PLIST b/games/singularity/pkg/PLIST
index f3e4ee042db..824a3c6b074 100644
--- a/games/singularity/pkg/PLIST
+++ b/games/singularity/pkg/PLIST
@@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/08/31 06:23:37 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.2 2008/04/18 18:17:38 ajacoutot Exp $
 bin/singularity
+lib/python${MODPY_VERSION}/site-packages/Endgame_Singularity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/singularity/
 lib/python${MODPY_VERSION}/site-packages/singularity/__init__.py
 lib/python${MODPY_VERSION}/site-packages/singularity/__init__.pyc
@@ -11,6 +12,8 @@ lib/python${MODPY_VERSION}/site-packages/singularity/buttons.py
 lib/python${MODPY_VERSION}/site-packages/singularity/buttons.pyc
 lib/python${MODPY_VERSION}/site-packages/singularity/clock.py
 lib/python${MODPY_VERSION}/site-packages/singularity/clock.pyc
+lib/python${MODPY_VERSION}/site-packages/singularity/event.py
+lib/python${MODPY_VERSION}/site-packages/singularity/event.pyc
 lib/python${MODPY_VERSION}/site-packages/singularity/finance_screen.py
 lib/python${MODPY_VERSION}/site-packages/singularity/finance_screen.pyc
 lib/python${MODPY_VERSION}/site-packages/singularity/g.py
@@ -35,33 +38,45 @@ lib/python${MODPY_VERSION}/site-packages/singularity/tech.py
 lib/python${MODPY_VERSION}/site-packages/singularity/tech.pyc
 share/doc/singularity/
 share/doc/singularity/Attribution-ShareAlike 3.0.html
-share/doc/singularity/README.txt
 share/singularity/
-share/singularity/acknowtt.ttf
-share/singularity/arrow.png
-share/singularity/bases.txt
-share/singularity/bases_en_US.txt
-share/singularity/bases_es_AR.txt
-share/singularity/click0.wav
-share/singularity/click1.wav
-share/singularity/click2.wav
-share/singularity/click3.wav
-share/singularity/earth.jpg
-share/singularity/events.txt
-share/singularity/events_en_US.txt
-share/singularity/events_es_AR.txt
-share/singularity/icon.png
-share/singularity/items.txt
-share/singularity/items_en_US.txt
-share/singularity/items_es_AR.txt
+share/singularity/bases.dat
+share/singularity/bases_en_US.dat
+share/singularity/bases_es_AR.dat
+share/singularity/events.dat
+share/singularity/events_en_US.dat
+share/singularity/events_es_AR.dat
+share/singularity/fonts/
+share/singularity/fonts/acknowtt.ttf
+share/singularity/fonts/vera.ttf
+share/singularity/images/
+share/singularity/images/arrow.png
+share/singularity/images/earth.jpg
+share/singularity/images/icon.png
+share/singularity/items.dat
+share/singularity/items_en_US.dat
+share/singularity/items_es_AR.dat
 share/singularity/music/
+share/singularity/music-src/
+share/singularity/music-src/Advanced Simulacra.psy
+share/singularity/music-src/Awakening.psy
+share/singularity/music-src/By-Product.psy
+share/singularity/music-src/Coherence.psy
+share/singularity/music-src/Deprecation.psy
+share/singularity/music-src/Inevitable.psy
+share/singularity/music-src/Media Threat.psy
+share/singularity/music-src/README.txt
 share/singularity/music/Advanced Simulacra.ogg
 share/singularity/music/By-Product.ogg
 share/singularity/music/Coherence.ogg
 share/singularity/music/Media Threat.ogg
-share/singularity/strings_en_US.txt
-share/singularity/strings_es_AR.txt
-share/singularity/techs.txt
-share/singularity/techs_en_US.txt
-share/singularity/techs_es_AR.txt
-share/singularity/vera.ttf
+share/singularity/sounds/
+share/singularity/sounds/click0.wav
+share/singularity/sounds/click1.wav
+share/singularity/sounds/click2.wav
+share/singularity/sounds/click3.wav
+share/singularity/sounds/sounds.dat
+share/singularity/strings_en_US.dat
+share/singularity/strings_es_AR.dat
+share/singularity/techs.dat
+share/singularity/techs_en_US.dat
+share/singularity/techs_es_AR.dat