diff --git a/graphics/lilypond/README b/graphics/lilypond/README
index 033b3da404..84c8c4cd96 100644
--- a/graphics/lilypond/README
+++ b/graphics/lilypond/README
@@ -1,10 +1,4 @@
 LilyPond is a music typesetter.  It produces beautiful
 sheet music using a description file as input.
 
-To enable documentation (man and info pages), first install dblatex and a
-newer version of texi2html than shipped with Slackware, then run the script as
-
-  # ENABLE_DOCS=yes ./lilypond.SlackBuild
-
-The documentation is disabled by default since SBo's texi2html package
-conflicts with Slackware's tetex package.
+extractpdfmark is an optional dependency.
diff --git a/graphics/lilypond/lilypond.SlackBuild b/graphics/lilypond/lilypond.SlackBuild
index 70e31a9fb4..61caa7cd99 100644
--- a/graphics/lilypond/lilypond.SlackBuild
+++ b/graphics/lilypond/lilypond.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for lilypond
 
-# Copyright 2012-2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2012-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lilypond
-VERSION=${VERSION:-2.18.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.22.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$(uname -m)" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$(uname -m) ;;
   esac
@@ -37,7 +37,7 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PRGNAM-$VERSION
 OUTPUT=${OUTPUT:-/tmp}
 
 DOCS="AUTHORS* COPYING* DEDICATION HACKING INSTALL* LICENSE* NEWS* README* ROADMAP"
@@ -45,6 +45,9 @@ DOCS="AUTHORS* COPYING* DEDICATION HACKING INSTALL* LICENSE* NEWS* README* ROADM
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -70,10 +73,8 @@ chmod -R u+w,go-w,a+rX-st .
 # Move the vim syntax highlighting files to where vim can find them.
 sed -i '/^vimdir/s|=.*|= $(datadir)/vim/vimfiles|' config.make.in
 
-# configure searches for naming variants like guile1.8-config but not this:
-GUILE_CONFIG=guile-config1.8 \
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+# --with-texgyre-dir is needed until/unless texlive's fonts are available by default:
+# `cd /etc/fonts/conf.d && ln -s ../conf.avail/09-texlive.conf`
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -83,8 +84,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --infodir=/usr/info \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
-  --disable-debugging \
-  --enable-documentation=${ENABLE_DOCS:-no}
+  --with-texgyre-dir=/usr/share/texmf-dist/fonts/opentype/public/tex-gyre \
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  GUILE_FLAVOR=guile-1.8 \
+  GUILE=guile1.8 \
 
 make
 make install DESTDIR=$PKG
@@ -92,16 +96,13 @@ make install DESTDIR=$PKG
 find $PKG -exec file {} + | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-if [ "x${ENABLE_DOCS:-no}" = "xno" ]; then
-  # These are (or should be) empty.
-  rmdir $PKG/usr/man/man1
-  rmdir $PKG/usr/man
-else
-  find $PKG/usr/man -type f -execdir gzip -9 {} +
+find $PKG/usr/man -type f -execdir gzip -9 {} +
 
-  rm -f $PKG/usr/info/dir
-  find $PKG/usr/info -name '*.info*' -type f -execdir gzip -9 {} +
-fi
+# `make install` prints a reminder to run install-info on lilypond-web.info
+# (only this $MAIN_INFO_DOC, not the others), but forgets to install it.
+# Until that is fixed, omit running install-info from doinst.sh.
+rm -f $PKG/usr/info/dir
+find $PKG/usr/info -name '*.info*' -type f -execdir gzip -9 {} +
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/graphics/lilypond/lilypond.info b/graphics/lilypond/lilypond.info
index b3864d97c9..52aaf1ae73 100644
--- a/graphics/lilypond/lilypond.info
+++ b/graphics/lilypond/lilypond.info
@@ -1,10 +1,10 @@
 PRGNAM="lilypond"
-VERSION="2.18.2"
-HOMEPAGE="http://www.lilypond.org/"
-DOWNLOAD="http://download.linuxaudio.org/lilypond/sources/v2.18/lilypond-2.18.2.tar.gz"
-MD5SUM="3c4bcbb708d12644668b32bfe82ebf25"
+VERSION="2.22.0"
+HOMEPAGE="https://lilypond.org/"
+DOWNLOAD="https://lilypond.org/download/sources/v2.22/lilypond-2.22.0.tar.gz"
+MD5SUM="4b0d869873b0120bda2e8bd94e1a628a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="fontforge t1utils guile1.8"
+REQUIRES="python3 fontforge texlive texi2html dblatex guile1.8"
 MAINTAINER="Kyle Guinn"
 EMAIL="elyk03@gmail.com"