diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 54ac1808e00..87a4cb447fc 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,24 +1,26 @@
-# $OpenBSD: Makefile,v 1.13 2000/03/24 23:28:02 espie Exp $
+# $OpenBSD: Makefile,v 1.14 2000/04/08 16:39:14 espie Exp $
 
 DISTNAME=       rplay-3.3.0
 CATEGORIES=	audio
-NEED_VERSION=	 1.230
+NEED_VERSION=	1.230
 MASTER_SITES=	http://rplay.doit.org/dist/
 
 MAINTAINER=	angelos@openbsd.org
 
 LICENSE_TYPE=		GPL
-PERMIT_PACKAGE_CDROM=	YES
-PERMIT_PACKAGE_FTP=	YES
-PERMIT_DISTFILES_CDROM=	YES
-PERMIT_DISTFILES_FTP=	YES
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
 
 LIB_DEPENDS=    gsm.1.0::audio/gsm
 
-USE_GMAKE=	yes
+USE_GMAKE=	Yes
 SYSCONFDIR=	/etc/rplay
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+= --sysconfdir=${SYSCONFDIR}
+HAS_CONFIGURE=	Yes
+CONFIGURE_ARGS+=--sysconfdir='$${DESTDIR}${SYSCONFDIR}' \
+	--prefix='$${DESTDIR}${PREFIX}'
+FAKE=		Yes
 
 post-configure:
 .for ff in rplay.conf.5 rplay.helpers.5 rplay.hosts.5 rplayd.8
@@ -27,6 +29,9 @@ post-configure:
 		mv ${ff}.tmp ${ff}
 .endfor
 
+post-build:
+	@cd ${WRKSRC}/doc && make info
+
 post-install:
 	@if [ ! -d /etc/rplay ]; then \
 		echo "Installing default configs..."; \
diff --git a/audio/rplay/patches/patch-ae b/audio/rplay/patches/patch-ae
new file mode 100644
index 00000000000..bc9b0853d96
--- /dev/null
+++ b/audio/rplay/patches/patch-ae
@@ -0,0 +1,18 @@
+--- doc/RPLAY.texi.orig	Mon Jun 29 20:04:34 1998
++++ doc/RPLAY.texi	Sat Apr  8 18:32:48 2000
+@@ -6,9 +6,15 @@
+ @finalout
+ @end iftex
+ @setchapternewpage odd
++@dircategory Programming & development tools
+ @c %**end of header
+ 
+ @ifinfo
++@format
++START-INFO-DIR-ENTRY
++* RPLAY: (RPLAY).		The RPLAY Protocol
++END-INFO-DIR-ENTRY
++@end format
+ 
+ This file documents RPLAY protocol.
+ 
diff --git a/audio/rplay/patches/patch-af b/audio/rplay/patches/patch-af
new file mode 100644
index 00000000000..13bf5e8900c
--- /dev/null
+++ b/audio/rplay/patches/patch-af
@@ -0,0 +1,18 @@
+--- doc/RPTP.texi.orig	Mon Jun 29 20:04:34 1998
++++ doc/RPTP.texi	Sat Apr  8 18:33:12 2000
+@@ -7,9 +7,15 @@
+ @finalout
+ @end iftex
+ @setchapternewpage odd
++@dircategory Programming & development tools
+ @c %**end of header
+ 
+ @ifinfo
++@format
++START-INFO-DIR-ENTRY
++* RPTP: (RPTP).		The RPTP Protocol
++END-INFO-DIR-ENTRY
++@end format
+ 
+ This file documents RPTP protocol.
+ 
diff --git a/audio/rplay/patches/patch-ag b/audio/rplay/patches/patch-ag
new file mode 100644
index 00000000000..0458af935ae
--- /dev/null
+++ b/audio/rplay/patches/patch-ag
@@ -0,0 +1,18 @@
+--- doc/librplay.texi.orig	Mon Jun 29 20:04:35 1998
++++ doc/librplay.texi	Sat Apr  8 18:33:46 2000
+@@ -6,9 +6,15 @@
+ @finalout
+ @end iftex
+ @setchapternewpage odd
++@dircategory Programming & development tools
+ @c %**end of header
+ 
+ @ifinfo
++@format
++START-INFO-DIR-ENTRY
++* Rplay library: (librplay).		Remote audio library
++END-INFO-DIR-ENTRY
++@end format
+ 
+ This file documents librplay.
+ 
diff --git a/audio/rplay/patches/patch-ah b/audio/rplay/patches/patch-ah
new file mode 100644
index 00000000000..dfe832614a4
--- /dev/null
+++ b/audio/rplay/patches/patch-ah
@@ -0,0 +1,18 @@
+--- doc/rplay.texi.orig	Mon Jun 29 20:04:35 1998
++++ doc/rplay.texi	Sat Apr  8 18:34:19 2000
+@@ -6,9 +6,15 @@
+ @finalout
+ @end iftex
+ @setchapternewpage odd
++@dircategory Programming & development tools
+ @c %**end of header
+ 
+ @ifinfo
++@format
++START-INFO-DIR-ENTRY
++* Rplay: (rplay).		Rplay Network Audio System
++END-INFO-DIR-ENTRY
++@end format
+ 
+ This file documents the rplay Network Audio System.
+ 
diff --git a/audio/rplay/pkg/PLIST b/audio/rplay/pkg/PLIST
index 31be3726190..aebbbdf224b 100644
--- a/audio/rplay/pkg/PLIST
+++ b/audio/rplay/pkg/PLIST
@@ -1,21 +1,29 @@
+@unexec install-info --delete --info-dir=%D/info %D/info/RPLAY.info
+@unexec install-info --delete --info-dir=%D/info %D/info/RPTP.info
+@unexec install-info --delete --info-dir=%D/info %D/info/librplay.info
+@unexec install-info --delete --info-dir=%D/info %D/info/rplay.info
 bin/rplay
 bin/rptp
-@comment requires XForms
-@comment bin/xrplay
-sbin/rplayd
 include/rplay.h
-lib/librplay.a
-info/librplay.info
-info/rplay.info
 info/RPLAY.info
 info/RPTP.info
+info/librplay.info
+info/rplay.info
+lib/librplay.a
 man/man1/rplay.1
-@comment man/man1/xrplay.1
 man/man1/rptp.1
 man/man5/rplay.conf.5
 man/man5/rplay.helpers.5
 man/man5/rplay.hosts.5
 man/man5/rplay.servers.5
 man/man8/rplayd.8
+sbin/rplayd
 @exec if [ ! -d /etc/rplay ]; then echo "Installing default configs..."; mkdir -p /etc/rplay; echo localhost >/etc/rplay/rplay.hosts; touch /etc/rplay/rplay.{conf,helpers,servers}; fi
 @unexec if [ -d /etc/rplay ]; then echo "***"; echo "*** Finished uninstalling rplay."; echo "*** Configuration files stored in /etc/rplay have not been removed."; echo "*** You may wish to remove them manually."; fi
+@exec install-info --info-dir=%D/info %D/info/RPLAY.info
+@exec install-info --info-dir=%D/info %D/info/RPTP.info
+@exec install-info --info-dir=%D/info %D/info/librplay.info
+@exec install-info --info-dir=%D/info %D/info/rplay.info
+@comment requires XForms
+@comment bin/xrplay
+@comment man/man1/xrplay.1