diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index bfd75d45562..3a1cc8157c9 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,24 +1,24 @@
-# $OpenBSD: Makefile,v 1.2 2006/11/13 12:51:15 steven Exp $
+# $OpenBSD: Makefile,v 1.3 2006/11/26 11:24:29 steven Exp $
 #
 # Credits to Matt Jibson. He did the initial work on this port and many
 # tools it depends on.
 
 SHARED_ONLY=	Yes
 
-COMMENT=	"LilyPond - music notation for everyone"
+COMMENT-main=	"LilyPond - music notation for everyone"
 COMMENT-docs=	"LilyPond documentation"
 
-DISTNAME=	lilypond-2.8.7
-DISTNAME-docs=	lilypond-2.8.7-1.documentation
-VERSION=	${DISTNAME:S,lilypond-,,}
-PKGNAME-docs=	lilypond-docs-${VERSION}
+VERSION=	2.8.8
+DISTNAME=	lilypond-${VERSION}
+DISTNAME-docs=	${DISTNAME}-1.documentation
+PKGNAME-main=	${DISTNAME}
+PKGNAME-docs=	${DISTNAME:S,-,-docs-,}
 CATEGORIES=	print
 
 DISTFILES=	${DISTNAME}.tar.gz ${DISTNAME-docs}.tar.bz2:0
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
-MULTI_PACKAGES=	-docs
-SUBPACKAGE?=
+MULTI_PACKAGES=	-main -docs
 
 DOCDIR=		${PREFIX}/share/doc/lilypond/${VERSION}
 
@@ -50,16 +50,16 @@ USE_GMAKE=		Yes
 USE_X11=		Yes
 MAKE_FILE=		GNUmakefile
 
-.if defined(PACKAGING) && ${SUBPACKAGE} == "-docs"
-PKG_ARCH=	*
-.else
-WANTLIB=	c fontconfig freetype m stdc++ X11
-MODULES=        devel/gettext lang/python
+PKG_ARCH-docs=		*
+LIB_DEPENDS-docs=
+RUN_DEPENDS-docs=
+
+WANTLIB-main=	c fontconfig freetype m stdc++ X11
+MODULES=	devel/gettext lang/python
 LIB_DEPENDS=	guile.>=15,guile-ltdl.>=1::lang/guile \
 		glib-2.0.>=1000,gmodule-2.0.>=1000,gobject-2.0.>=1000::devel/glib2 \
 		pango-1.0.>=1200,pangoft2-1.0.>=1200::devel/pango
 RUN_DEPENDS=	::print/ghostscript/gnu
-.endif
 
 BUILD_DEPENDS= 	::print/mftrace \
 		::devel/bison \
@@ -70,6 +70,10 @@ SUBST_VARS+=	VERSION
 
 NO_REGRESS=	Yes
 
+# Fails for yet unknown reason on mf when mftracing feta26 with EINVAL
+# in intercept_get_string.
+NO_SYSTRACE=	Yes
+
 post-extract:
 	mkdir -p ${WRKDIR}/docs
 	cd ${WRKDIR}/docs && \
diff --git a/print/lilypond/distinfo b/print/lilypond/distinfo
index 01144bd71dd..59a5e11d698 100644
--- a/print/lilypond/distinfo
+++ b/print/lilypond/distinfo
@@ -1,8 +1,8 @@
-MD5 (lilypond-2.8.7-1.documentation.tar.bz2) = 492b1b59b1b66e8c74c0551ec2137d65
-MD5 (lilypond-2.8.7.tar.gz) = f2513f545adb211a256c21cc6b28ab3a
-RMD160 (lilypond-2.8.7-1.documentation.tar.bz2) = f4e36a6b463bbc8b5a2ba785907abaf527876fd7
-RMD160 (lilypond-2.8.7.tar.gz) = 19a45def6da3c63e78966ed27ffe1251bcc15e4b
-SHA1 (lilypond-2.8.7-1.documentation.tar.bz2) = 42d91faf45cbb1c4c3dbf636dcead2e65fb2f5c4
-SHA1 (lilypond-2.8.7.tar.gz) = 8bcb55b484f403d2e109cd5c6b9fa05744038102
-SIZE (lilypond-2.8.7-1.documentation.tar.bz2) = 30642356
-SIZE (lilypond-2.8.7.tar.gz) = 2465583
+MD5 (lilypond-2.8.8-1.documentation.tar.bz2) = cb61129fc6eb537ccdf6d961eb5ba573
+MD5 (lilypond-2.8.8.tar.gz) = 2fe58ff2fcbc848def46ef287a693189
+RMD160 (lilypond-2.8.8-1.documentation.tar.bz2) = 222ec7ee3eeb4a23108543eeb802b3447cb1e9c6
+RMD160 (lilypond-2.8.8.tar.gz) = d1040985f3c8978b90da8e9fcadbe12bc2b9d9a9
+SHA1 (lilypond-2.8.8-1.documentation.tar.bz2) = 8755f128d524447d319be767e17b65d2042d3ee1
+SHA1 (lilypond-2.8.8.tar.gz) = 40449fc7cbe8dd47510d50d054d4787f796261fe
+SIZE (lilypond-2.8.8-1.documentation.tar.bz2) = 30822902
+SIZE (lilypond-2.8.8.tar.gz) = 2465326
diff --git a/print/lilypond/pkg/DESCR b/print/lilypond/pkg/DESCR-main
similarity index 100%
rename from print/lilypond/pkg/DESCR
rename to print/lilypond/pkg/DESCR-main
diff --git a/print/lilypond/pkg/PLIST b/print/lilypond/pkg/PLIST-main
similarity index 99%
rename from print/lilypond/pkg/PLIST
rename to print/lilypond/pkg/PLIST-main
index ef18b6b7233..dd7d4006839 100644
--- a/print/lilypond/pkg/PLIST
+++ b/print/lilypond/pkg/PLIST-main
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2006/10/29 19:27:12 kili Exp $
+@comment $OpenBSD: PLIST-main,v 1.1 2006/11/26 11:24:29 steven Exp $
+@pkgpath print/lilypond
 bin/abc2ly
 bin/convert-ly
 bin/etf2ly