diff --git a/graphics/lilypond/lilypond.SlackBuild b/graphics/lilypond/lilypond.SlackBuild
index a8854cffde..55fff4ed3c 100644
--- a/graphics/lilypond/lilypond.SlackBuild
+++ b/graphics/lilypond/lilypond.SlackBuild
@@ -1,18 +1,37 @@
 #!/bin/sh
 
 # Slackware build script for lilypond
-# Written by Kyle Guinn <elyk03@gmail.com>
+
+# Copyright 2012 Kyle Guinn <elyk03@gmail.com>, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lilypond
-VERSION=${VERSION:-2.16.0}
+VERSION=${VERSION:-2.16.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
+  case "$(uname -m)" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
+       *) ARCH=$(uname -m) ;;
   esac
 fi
 
@@ -72,6 +91,10 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*.info*
 
+# Move the vim syntax highlighting files to where vim can find them.
+mkdir -p $PKG/usr/share/vim
+mv $PKG/usr/share/$PRGNAM/$VERSION/vim $PKG/usr/share/vim/vimfiles
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/graphics/lilypond/lilypond.info b/graphics/lilypond/lilypond.info
index 5af3daf045..b8bf829bbe 100644
--- a/graphics/lilypond/lilypond.info
+++ b/graphics/lilypond/lilypond.info
@@ -1,8 +1,8 @@
 PRGNAM="lilypond"
-VERSION="2.16.0"
+VERSION="2.16.1"
 HOMEPAGE="http://www.lilypond.org/"
-DOWNLOAD="http://download.linuxaudio.org/lilypond/sources/v2.16/lilypond-2.16.0.tar.gz"
-MD5SUM="c4637d5f3e485c529c2d98fe372c41fe"
+DOWNLOAD="http://download.linuxaudio.org/lilypond/sources/v2.16/lilypond-2.16.1.tar.gz"
+MD5SUM="3a87363ba287d2958ee9414c3c16bbb2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fontforge mftrace"