diff --git a/audio/baudline/Makefile b/audio/baudline/Makefile
index 7e9148dd2266..97d90bf560e3 100644
--- a/audio/baudline/Makefile
+++ b/audio/baudline/Makefile
@@ -6,59 +6,50 @@
 #
 
 PORTNAME=	baudline
-PORTVERSION=	0.88
+PORTVERSION=	0.89
 CATEGORIES=	audio
 MASTER_SITES=	http://www.geocities.com/sigfriedblip/baudline/
 DISTNAME=	baudline_${PORTVERSION:S/.p/pre/}_i686
 
 MAINTAINER=	dyeske@yahoo.com
 
-FETCH_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-DOCDIR=		share/doc/${PORTNAME}
-DOC_FILES=	mailcap.txt mime.types.txt README
+USE_X_PREFIX=	yes
 ONLY_FOR_ARCHS=	i386
+USE_LINUX=	yes
+NO_BUILD=	yes
+STRIP=
+
 RESTRICTED=	"author requests no distribution except from their site"
 NO_CDROM=	${RESTRICTED}
 NO_PACKAGE=	${RESTRICTED}
-USE_X_PREFIX=	yes
-NO_BUILD=	yes
-LINPROCFS!=	/sbin/mount | /usr/bin/grep linprocfs | /usr/bin/awk '{print $1}'
 
 .include <bsd.port.pre.mk>
 
-pre-fetch:
+LINPROCFS!=	/sbin/mount | ${GREP} linprocfs | ${AWK} '{print $1}'
+
+pre-everything::
 .if ${LINPROCFS}
-	@${ECHO}
-	@${ECHO} Check if linprocfs is running: YES
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} "Check if linprocfs is running: YES"
 .else
-	@${ECHO} -----------------------------------------------------------
-	@${ECHO}
-	@${ECHO} Baudline needs a running linprocfs, which is not
-	@${ECHO} activated on your system. Please read the linprocfs\(5\)
-	@${ECHO} manpage and add the following line to /etc/fstab:
-	@${ECHO}
-	@${ECHO} linproc /compat/linux/proc linprocfs rw 0 0
-	@${ECHO}
-	@${ECHO} -----------------------------------------------------------
+	@${ECHO_CMD} "-----------------------------------------------------------"
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} "Baudline needs a running linprocfs, which is not"
+	@${ECHO_CMD} "activated on your system. Please read the linprocfs\(5\)"
+	@${ECHO_CMD} "manpage and add the following line to /etc/fstab:"
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} "linproc /compat/linux/proc linprocfs rw 0 0"
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} "-----------------------------------------------------------"
 	@${FALSE}
 .endif
 
-pre-install:
-	${ECHO} bin/baudline > ${PLIST}
-.if !defined(NOPORTDOCS)
-.for i in ${DOC_FILES}
-	${ECHO} ${DOCDIR}/`${BASENAME} ${i}` >> ${PLIST}
-.endfor
-	${ECHO} @dirrm ${DOCDIR} >> ${PLIST}
-.endif
-
 do-install:
-	${CP} ${WRKSRC}/baudline ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/baudline ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/${DOCDIR}
-.for i in ${DOC_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/${DOCDIR}
+	@${MKDIR} ${DOCSDIR}
+.for i in README mailcap.txt mime.types.txt
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/audio/baudline/distinfo b/audio/baudline/distinfo
index edb7f7ee2a32..b6a5790cfb0a 100644
--- a/audio/baudline/distinfo
+++ b/audio/baudline/distinfo
@@ -1 +1 @@
-MD5 (baudline_0.88_i686.tar.gz) = 4a0cc96e0d93d1300e72d1dc535fd572
+MD5 (baudline_0.89_i686.tar.gz) = 368f45b16caaeb51682de03b764e1771
diff --git a/audio/baudline/pkg-plist b/audio/baudline/pkg-plist
new file mode 100644
index 000000000000..4838caa3bf65
--- /dev/null
+++ b/audio/baudline/pkg-plist
@@ -0,0 +1,5 @@
+bin/baudline
+%%PORTDOCS%%share/doc/baudline/README
+%%PORTDOCS%%share/doc/baudline/mailcap.txt
+%%PORTDOCS%%share/doc/baudline/mime.types.txt
+%%PORTDOCS%%@dirrm share/doc/baudline