diff --git a/lilypond/PKGBUILD b/lilypond/PKGBUILD
index 5706d06c4..05c4f365e 100644
--- a/lilypond/PKGBUILD
+++ b/lilypond/PKGBUILD
@@ -3,13 +3,13 @@
 pkgname=lilypond
 pkgver=2.18.2
 _pkgver=2.18
-pkgrel=2
+pkgrel=3
 pkgdesc="A music engraving program, devoted to producing the highest-quality sheet music possible."
 arch=('x86_64')
 url="http://lilypond.org/"
 license=('GPL')
 depends=('fontconfig' 'freetype2' 'ghostscript'
-         'guile' 'pango' 'python')
+         'guile1.8' 'pango' 'python')
 makedepends=('bison' 'flex' 'fontforge' 'gettext' 'gsfonts'
              'perl' 'texinfo' 't1utils' 'texlive-core' 'texlive-langcyrillic' 'netpbm' 'texi2html' 'dblatex' 'zip' 'imagemagick')
 optdepends=('netpbm: building HTML documentation'
@@ -22,8 +22,8 @@ install=$pkgname.install
 source=("http://download.linuxaudio.org/${pkgname}/sources/v${_pkgver}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('3c4bcbb708d12644668b32bfe82ebf25')
 
-build() {
-  cd "$srcdir/lilypond-$pkgver"
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
 
   # python2 fix
   for file in $(find . -name '*.py' -print); do
@@ -31,11 +31,23 @@ build() {
     sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
   done
 
+  sed -i 's|GUILE_CFLAGS=.*|GUILE_CFLAGS="`pkg-config --cflags guile-1.8`"|' configure
+  sed -i 's|GUILE_LDFLAGS=.*|GUILE_LDFLAGS="`pkg-config --libs guile-1.8`"|' configure
+
+  rm -rf lily/out/ python/out/
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  export PYTHON=/usr/bin/python2
+  export GUILE=/usr/bin/guile1.8
+  export GUILE_CONFIG=/usr/bin/guile-config1.8
+  export LDFLAGS="$LDFLAGS -lpthread"
   ./configure --prefix=/usr
-  make all
+  make
 }
 
 package() {
-  cd "$srcdir/lilypond-$pkgver"
-  make DESTDIR="$pkgdir/" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" vimdir="/usr/share/vim/vimfiles" install
 }