diff --git a/Formula/lilypond.rb b/Formula/lilypond.rb
index 22f466c8187..10d981b18b3 100644
--- a/Formula/lilypond.rb
+++ b/Formula/lilypond.rb
@@ -5,6 +5,10 @@ class TexInstalled < Requirement
     A TeX/LaTeX installation is required to install.
     You can obtain the TeX distribution for Mac OS X from:
         http://www.tug.org/mactex/
+    After you install it, put its bin in your PATH and open a new Terminal tab.
+    You should also do this because MacTex installs with root ownership:
+        sudo chown -R $USER `brew --prefix`
+    That will change all the files and directories back to being owned by you.
     EOS
   end
   def satisfied?
@@ -17,8 +21,8 @@ end
 
 class Lilypond < Formula
   homepage 'http://lilypond.org/'
-  url 'http://download.linuxaudio.org/lilypond/sources/v2.14/lilypond-2.14.2.tar.gz'
-  md5 '4053a19e03181021893981280feb9aaa'
+  url 'http://download.linuxaudio.org/lilypond/sources/v2.16/lilypond-2.16.0.tar.gz'
+  sha1 'b5edfdd1332a5cee94bd31c7b1e8b08909c0a068'
 
   depends_on TexInstalled.new
   depends_on 'pkg-config' => :build
@@ -29,16 +33,34 @@ class Lilypond < Formula
   depends_on 'mftrace'
   depends_on 'fontforge'
   depends_on 'texinfo'
+  depends_on :x11
 
   skip_clean :all
 
+  fails_with :clang do
+    build :all
+    cause 'Strict C99 compliance error in a pointer conversion.'
+  end
+
   def install
     gs = Formula.factory('ghostscript')
-    system "./configure", "--prefix=#{prefix}",
+    system "./configure", "--prefix=#{prefix}", "--enable-rpath",
                           "--with-ncsb-dir=#{gs.share}/ghostscript/fonts/"
 
     # Separate steps to ensure that lilypond's custom fonts are created.
-    system "make"
+    system 'make all'
     system "make install"
   end
+
+  def test
+    mktemp do
+      (Pathname.pwd+'test.ly').write <<-EOS.undent
+        \\version "2.16.0"
+        \\header { title = "Do-Re-Mi" }
+        { c' d' e' }
+      EOS
+      lilykeg = Formula.factory('lilypond').linked_keg
+      system "#{lilykeg}/bin/lilypond test.ly && /usr/bin/qlmanage -p test.pdf"
+    end
+  end
 end