diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81c411e14..647a13dee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -259,7 +259,7 @@ See GregorioRef.pdf for full details.
 - `\gresethyphen{force}` forces GregorioTeX to put a hyphen between each syllable in a polysyllabic word.  `\gresethyphen{auto}` restores behavior to normal.
 - Support for custom vowel centering rules.  Put a file called `gregorio-vowels.dat` into your project directory or into a directory accessible from TEXMF and add the header `language: name;` to your gabc file.  The `gregorio-vowels.dat` file describes how vowels are to be located in the *name* language.  See GregorioRef for details.
 - `\gresetlinecolor` takes a named color as an argument.  As a result, the red staff lines can be made consistent with the text, even when the user changes `gregoriocolor` with `\gresetlinecolor{gregoriocolor}`.  Addresses [#21787 on the old tracker](https://gna.org/bugs/index.php?21787).
-- Package option `deprecated=false`. Causes all deprecated commands to raise an error and halt TeX.
+- Package option `allowdeprecated=false`. Causes all deprecated commands to raise an error and halt TeX.
 - The ability to add LilyPond-like point-and-click textedit links into the PDF file to aid with debugging scores.  This must be explicitly enabled and **should be turned off** when producing files for distribution as it embeds path information into the output.  To enable this, you must pass the `-p` option to gregorio when compiling gabc files and add `\gresetpointandclick{on}` before including the score.  It may be toggled back off with `\gresetpointandclick{off}`.  See GregorioRef for details (for the change request, see [#528](https://github.com/gregorio-project/gregorio/issues/528)).
 - New score fonts with glyphs unique to Dominican chant.  These fonts replace the epiphonus and the augmented liquescents with corresponding figures from Dominican liturgical books.  To use the new fonts, pass the `[op]` option to the `\gresetgregoriofont` command (i.e., `\gresetgregoriofont[op]{greciliae}`).  See GregorioRef for details (for the change request, see [#1](https://github.com/gregorio-project/gregorio/issues/1)).
 - Support for "punctum cavum inclinatum" and "punctum cavum inclinatum auctus" figures.  The gabc for these are `(Gr)` and `(Gr<)`, where `G` is the capitalized pitch letter.
diff --git a/Makefile.am b/Makefile.am
index 53b9ca918..b91d1f8af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
-# 
+#
 # This file is part of Gregorio.
 #
 # Gregorio is free software: you can redistribute it and/or modify
@@ -28,3 +28,9 @@ make-fonts:
 	make -C fonts fonts
 
 export TOP_LEVEL_MAKE = true
+
+gregoriotex.tds.zip: dist install-gtex.sh
+	./install-gtex.sh tds
+
+ctan: dist gregoriotex.tds.zip build-ctan.sh
+	./build-ctan.sh
diff --git a/UPGRADE.md b/UPGRADE.md
index 207d8723f..5520c67f8 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -137,7 +137,7 @@ Old command names should still work for now, but will raise a deprecation warnin
 
 - `\grescaledim`: This function now takes two arguments.  The second should be `yes`, `true`, `on`, or `scalable` to acheive the old behavior.
 
-Additionally a new package option has been added. This option, `deprecated=false`, is helpful if you wish to ensure that your TeX file is compliant with the new naming system. This option causes all deprecated commands to raise an error, halting TeX, thus allowing you to actively find all deprecated commands and update them in your TeX file.
+Additionally a new package option has been added. This option, `allowdeprecated=false`, is helpful if you wish to ensure that your TeX file is compliant with the new naming system. This option causes all deprecated commands to raise an error, halting TeX, thus allowing you to actively find all deprecated commands and update them in your TeX file.
 
 ### Barred letters
 
diff --git a/build-ctan.sh b/build-ctan.sh
new file mode 100755
index 000000000..75a20e24a
--- /dev/null
+++ b/build-ctan.sh
@@ -0,0 +1,42 @@
+#! /usr/bin/env bash
+
+# Script to be executed by make ctan-dist
+
+VERSION=`head -1 .gregorio-version`
+FILEVERSION=`echo $VERSION | sed 's/\./_/g'`
+
+rm -rf ctan
+mkdir -p ctan/gregoriotex/
+cp gregoriotex.tds.zip ctan/gregoriotex.tds.zip
+cp gregorio-$VERSION.tar.bz2 ctan/gregoriotex/
+cd ctan/gregoriotex
+tar xf gregorio-$VERSION.tar.bz2
+rm gregorio-$VERSION.tar.bz2
+cp ../../*.md .
+cd gregorio-$VERSION
+mv doc/ ../
+mv tex/ ../
+mv fonts/ ../
+mv examples/ ../doc/
+rm -rf macosx debian
+cd ..
+rm doc/Makefile*
+rm doc/examples/Makefile*
+rm doc/examples/debugging.tex
+rm tex/Makefile*
+mkdir tex/lualatex
+mkdir tex/luatex
+mv tex/*.sty tex/lualatex
+mv tex/*.* tex/luatex
+rm fonts/Makefile*
+mkdir fonts/sources/
+mkdir fonts/truetype/
+mv fonts/*.ttf fonts/truetype
+mv fonts/*.* fonts/sources
+cd gregorio-$VERSION
+zip -r ../gregorio-$VERSION.zip * --exclude=*.DS_Store*
+cd ..
+rm -rf gregorio-$VERSION
+cd ..
+zip -r ../gregoriotex.zip gregoriotex gregoriotex.tds.zip
+cd ..
diff --git a/install-gtex.sh b/install-gtex.sh
index d0183efae..b9faee7ed 100755
--- a/install-gtex.sh
+++ b/install-gtex.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Copyright (C) 2015 The Gregorio Project (see CONTRIBUTORS.md)
-# 
+#
 # This file is part of Gregorio.
 #
 # Gregorio is free software: you can redistribute it and/or modify
@@ -57,17 +57,24 @@
 #   Creates a TDS-ready archive named gregoriotex.tds.zip
 #
 
-TEXFILES=(tex/*.tex tex/gregorio*.sty tex/*.lua tex/*.dat)
+VERSION=`head -1 .gregorio-version`
+FILEVERSION=`echo $VERSION | sed 's/\./_/g'`
+
+TEXFILES=(tex/gregoriotex*.tex tex/gsp-default.tex tex/gregoriotex*.lua tex/*.dat)
+LATEXFILES=(tex/gregorio*.sty)
 TTFFILES=(gregorio.ttf greciliae.ttf parmesan.ttf gregorio-op.ttf
           greciliae-op.ttf parmesan-op.ttf greextra.ttf gregall.ttf
           gresgmodern.ttf)
-DOCFILES=(fonts/README.md)
+DOCFILES=(doc/Appendix*.tex doc/Command*.tex doc/Gabc.tex
+          doc/*Ref.tex doc/*Ref.lua doc/*.gabc doc/Gregorio*Ref-$FILEVERSION.pdf)
+EXAMPLEFILES=(examples/FactusEst.gabc examples/PopulusSion.gabc examples/main-lualatex.tex)
 FONTSRCFILES=(gregorio-base.sfd parmesan-base.sfd greciliae-base.sfd
               greextra.sfd squarize.py convertsfdtottf.py gregall.sfd
-              gresgmodern.sfd)
+              gresgmodern.sfd README.md)
 
 NAME=${NAME:-gregoriotex}
 FORMAT=${FORMAT:-luatex}
+LATEXFORMAT=${LATEXFORMAT:-lualatex}
 TEXHASH=${TEXHASH:-texhash}
 KPSEWHICH=${KPSEWHICH:-kpsewhich}
 CP=${CP:-cp}
@@ -140,8 +147,10 @@ function install_to {
 
 echo "Installing in '${TEXMFROOT}'."
 install_to "${TEXMFROOT}/tex/${FORMAT}/${NAME}" "${TEXFILES[@]}"
+install_to "${TEXMFROOT}/tex/${LATEXFORMAT}/${NAME}" "${LATEXFILES[@]}"
 install_to "${TEXMFROOT}/fonts/truetype/public/${NAME}" "${TTFFILES[@]}"
 install_to "${TEXMFROOT}/doc/${FORMAT}/${NAME}" "${DOCFILES[@]}"
+install_to "${TEXMFROOT}/doc/${FORMAT}/${NAME}/examples" "${EXAMPLEFILES[@]}"
 install_to "${TEXMFROOT}/fonts/source/${NAME}" "${FONTSRCFILES[@]}"
 
 if [ "$arg" = 'tds' ]