diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index b4ff8e9a5e..184ccbd110 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,14 +1,15 @@
 # Template file for 'lilypond'
 pkgname="lilypond"
 version="2.19.80"
-revision=1
+revision=2
 _tlversion=2017
 build_wrksrc="build"
 build_style="gnu-configure"
 configure_script="../configure"
-configure_args="--enable-documentation=off --with-texgyre-dir=/opt/texlive/${_tlversion}/texmf-dist/fonts/opentype/public/tex-gyre"
+configure_args="--disable-documentation
+ --with-texgyre-dir=/opt/texlive/${_tlversion}/texmf-dist/fonts/opentype/public/tex-gyre"
 hostmakedepends="automake autogen pkg-config flex bison fontforge gettext
- perl texinfo texlive-bin gnupg guile1.8"
+ perl texlive-bin gnupg guile1.8"
 makedepends="guile1.8-devel fontconfig-devel freetype-devel pango-devel
  python-devel libltdl-devel gc-devel"
 depends="python ghostscript"
@@ -18,7 +19,14 @@ homepage="http://lilypond.org/"
 license="GPL-3, FDL-1.3"
 distfiles="http://download.linuxaudio.org/${pkgname}/source/v2.19/${pkgname}-${version}.tar.gz"
 checksum=3679db30a3f74ce8668691952fb0dd58d8ad6bad099017e815ca3e4312261453
-nocross="No rule to make target 'out/convert-ly.1', needed by 'man'.  Stop."
+
+if [ -n "${CROSS_BUILD}" ]; then
+	# needs guile-config-1.8 and python-config
+	hostmakedepends+=" guile1.8-devel python-devel"
+	makedepends+=" libfl-devel"
+	configure_args+=" --with-python-lib=python2.7
+	 --with-python-include=${XBPS_CROSS_BASE}/usr/include/python2.7"
+fi
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="no texlive available yet";;
@@ -33,10 +41,7 @@ post_extract() {
 pre_configure() {
 	source /etc/profile.d/texlive.sh
 	tlmgr install t1utils lh epsf tex-gyre
-
-	cd ..
-	./autogen.sh --noconfigure
-	cd ${build_wrksrc}
+	cd .. && ./autogen.sh --noconfigure
 }
 
 do_build() {