diff --git a/audio/adplay/Makefile b/audio/adplay/Makefile
index 565d2e9131c3..8aeac17ca42f 100644
--- a/audio/adplay/Makefile
+++ b/audio/adplay/Makefile
@@ -7,41 +7,53 @@
 
 PORTNAME=	adplay
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	adplug
+DISTFILES=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${EXTRACT_SUFX} \
+		${DBFILE}
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	AdLib player using adplug library
 
 LIB_DEPENDS=	adplug-2.0.0:${PORTSDIR}/audio/libadplug
 
-PLIST_FILES=	bin/adplay
-
 GNU_CONFIGURE=	yes
 USE_GCC=	3.4+
 
+DBFILE=		adplug.db
+
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libbinio
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+CONFIGURE_ARGS=	--sharedstatedir=${DATADIR}
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
 		CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \
 		CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
 MAN1=		adplay.1
+PLIST_FILES=	bin/adplay %%DATADIR%%/adplug.db
+PLIST_DIRS=	%%DATADIR%%
 
 .include <bsd.port.pre.mk>
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|^\(adplug_data_dir.*\)/.*|\1|' \
+		${WRKSRC}/src/Makefile.in
+
 .if ${OSVERSION} > 500000
-	${RM} ${WRKSRC}/src/getopt.h
+	@${RM} ${WRKSRC}/src/getopt.h
 .else
-	${CP} ${FILESDIR}/getopt.h ${WRKSRC}/src/
+	@${CP} ${FILESDIR}/getopt.h ${WRKSRC}/src
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/adplay ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/adplay.1 ${MANPREFIX}/man/man1
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${DISTDIR}/${DBFILE} ${DATADIR}
 
 .include <bsd.port.post.mk>
diff --git a/audio/adplay/distinfo b/audio/adplay/distinfo
index 47941c839ca4..8ca2ad8528ef 100644
--- a/audio/adplay/distinfo
+++ b/audio/adplay/distinfo
@@ -1,3 +1,6 @@
 MD5 (adplay-1.5.tar.gz) = 159edf8e4d6290752ab21df8f3dc7f3e
 SHA256 (adplay-1.5.tar.gz) = 8124693ebbbc3f99eae36b76fa5fff74aaf09ad66dc40ced17f4502860427fbb
 SIZE (adplay-1.5.tar.gz) = 339687
+MD5 (adplug.db) = 5cbd3df5537700f28c350dbe08695c28
+SHA256 (adplug.db) = 7db721bf259b7768556c3ddcb6a704a1093bb01a6373b519b27cdcfd8e88bd32
+SIZE (adplug.db) = 3184