diff --git a/games/asc/Makefile b/games/asc/Makefile
index 6fb65091ffd4..d7a0b1e34eba 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2006/06/12 16:28:07 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2007/03/10 17:08:18 wiz Exp $
 
-DISTNAME=	asc-source+music-1.16.3.0
-PKGNAME=	${DISTNAME:S/-source+music//}
-PKGREVISION=	3
+DISTNAME=	asc-source-1.16.4.0
+PKGNAME=	${DISTNAME:S/-source//}
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=asc-hq/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,17 +10,31 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.asc-hq.org/
 COMMENT=	Turn based strategy game
 
+DIST_SUBDIR=		asc
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX} frontiers.mp3 \
+			machine_wars.mp3 time_to_strike.mp3
+.for file in frontiers.mp3 machine_wars.mp3 time_to_strike.mp3
+SITES.${file}=	http://asc-hq.org/
+.endfor
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake perl:build pkg-config
+REPLACE_PERL=		checkfordata.pl
 GNU_CONFIGURE=		yes
 CPPFLAGS.NetBSD+=	-D_UNICODE_BROKEN_
 
 # ../weaponguide.cpp:1205: virtual memory exhausted
 UNLIMIT_RESOURCES=	datasize
 
+post-extract:
+	mv ${WRKDIR}/*.mp3 ${WRKSRC}/data/music
+
+# bug in 1.16.4.0, remove on update
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/data/asc.gfx ${PREFIX}/share/games/asc
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
diff --git a/games/asc/distinfo b/games/asc/distinfo
index 7bc5a7e8a8d9..2fd963b60a43 100644
--- a/games/asc/distinfo
+++ b/games/asc/distinfo
@@ -1,5 +1,14 @@
-$NetBSD: distinfo,v 1.8 2006/01/24 07:33:34 wiz Exp $
+$NetBSD: distinfo,v 1.9 2007/03/10 17:08:18 wiz Exp $
 
-SHA1 (asc-source+music-1.16.3.0.tar.bz2) = d239a27350c75aa52f2d52591803eb66bb8cd6dd
-RMD160 (asc-source+music-1.16.3.0.tar.bz2) = 3049adab9e968b959be8e7fd891d02ca7c6cdbf7
-Size (asc-source+music-1.16.3.0.tar.bz2) = 18859902 bytes
+SHA1 (asc/asc-source-1.16.4.0.tar.bz2) = 338081823943e08848325e6f2126e5c533517ae9
+RMD160 (asc/asc-source-1.16.4.0.tar.bz2) = a4de675628875cc36f30b39d1fb1ef3ac879e369
+Size (asc/asc-source-1.16.4.0.tar.bz2) = 11730677 bytes
+SHA1 (asc/frontiers.mp3) = 7c6753fb5fe5e498fa780271da0a302c0619a1ca
+RMD160 (asc/frontiers.mp3) = 4d2ec2ff647ef6ef66a2264465b86451bbba64f5
+Size (asc/frontiers.mp3) = 4407769 bytes
+SHA1 (asc/machine_wars.mp3) = d05e92b46ae0e90d9f3b38ce9c4b41bde599a02e
+RMD160 (asc/machine_wars.mp3) = 192b2a4f20676cd1ce3145df08997d9793ea373f
+Size (asc/machine_wars.mp3) = 2905989 bytes
+SHA1 (asc/time_to_strike.mp3) = 76abf03155d9a21584f30c20370db0a93449c78a
+RMD160 (asc/time_to_strike.mp3) = a402a00e490f7aca0871b52165d63f3bde3b3bff
+Size (asc/time_to_strike.mp3) = 3242969 bytes