diff --git a/build-shared.sh b/build-shared.sh
index 164d51b8367cbc5f5c25f18d25936619dc5e2c72..bd9c8eaa7f9c41aac6275767316ffb65b89d30d5 100755
--- a/build-shared.sh
+++ b/build-shared.sh
@@ -296,6 +296,7 @@ TL_MAKE=$MAKE ../source/configure  $CONFHOST $CONFBUILD  $WARNINGFLAGS\
     --without-system-t1lib \
     --without-system-icu \
     --without-system-graphite \
+    --without-system-harfbuzz \
     --without-system-zziplib \
     --without-mf-x-toolkit --without-x \
    || exit 1 
diff --git a/build.sh b/build.sh
index 9a4f8466677b9c867423db9d55720ed35a71146f..a4bf1b57d48977ed885ff163fd457f9a2047f9f1 100755
--- a/build.sh
+++ b/build.sh
@@ -302,6 +302,7 @@ TL_MAKE=$MAKE ../source/configure  $CONFHOST $CONFBUILD  $WARNINGFLAGS\
     --without-system-t1lib \
     --without-system-icu \
     --without-system-graphite \
+    --without-system-harfbuzz \
     --without-system-zziplib \
     --without-mf-x-toolkit --without-x \
    || exit 1 
diff --git a/source/doc/ChangeLog b/source/doc/ChangeLog
index a3b45a264a5e42cb46c33035cb192af3297b4c88..e02191522e68e5b9f48694d4f6a1856e950c011b 100644
--- a/source/doc/ChangeLog
+++ b/source/doc/ChangeLog
@@ -1,3 +1,11 @@
+2018-02-20  Karl Berry  <karl@freefriends.org>
+
+	* tlbuild.texi (Continuous integration): Texinfo syntax, wording.
+
+2018-02-20  Norbert Preining  <norbert@preining.info>
+
+	* tlbuild.texi (Continuous integration): new chapter.
+
 2018-02-10  Karl Berry  <karl@freefriends.org>
 
 	* tlbuild.texi (Adding a new program module): more specifics
diff --git a/source/doc/tlbuild.info b/source/doc/tlbuild.info
index 3dda348da6b9810c6c81a527fe381f8755834855..e777a5e066bac5df9e7c56da5c71c09fa8401ae5 100644
--- a/source/doc/tlbuild.info
+++ b/source/doc/tlbuild.info
@@ -1,4 +1,4 @@
-This is tlbuild.info, produced by makeinfo version 6.5 from
+This is tlbuild.info, produced by makeinfo version 6.4 from
 tlbuild.texi.
 
 This file documents the TeX Live build system and more.
@@ -49,6 +49,7 @@ For an overview of this manual, *note Introduction::.
 * Configure options::           List of all configure options.
 * Cross compilation::           Building on host X for target Y.
 * Coding conventions::          Conventions to follow.
+* Continuous integration::      Automated build testing.
 * install-tl::                  The TeX Live installer.
 * tlmgr::                       The native TeX Live package manager.
 * Index::                       General index.
@@ -1909,7 +1910,7 @@ sufficiently recent installed versions of 'tangle', 'ctangle',
 thus cross compilation is not possible.
 
 
-File: tlbuild.info,  Node: Coding conventions,  Next: install-tl,  Prev: Cross compilation,  Up: Top
+File: tlbuild.info,  Node: Coding conventions,  Next: Continuous integration,  Prev: Cross compilation,  Up: Top
 
 9 Coding conventions
 ********************
@@ -2031,7 +2032,85 @@ must be carefully analyzed to make sure that they cannot cause the
 modification of quantities supposed to be constant.
 
 
-File: tlbuild.info,  Node: install-tl,  Next: tlmgr,  Prev: Coding conventions,  Up: Top
+File: tlbuild.info,  Node: Continuous integration,  Next: install-tl,  Prev: Coding conventions,  Up: Top
+
+10 Continuous integration
+*************************
+
+Overview: the sources of TeX Live are subjected to continuous
+integration testing on Travis-CI
+(<https://travis-ci.org/TeX-Live/texlive-source>) via a git-svn mirror
+of the sources that is pushed to Github
+(<https://github.com/TeX-Live/texlive-source>).  The git-svn mirror is
+updated (currently) at 30 minute intervals, and only the last commit
+pushed is tested on Travis-CI.
+
+Transfer from Subversion to Github
+----------------------------------
+
+git-svn (<https://git-scm.com/docs/git-svn>) is used to check out the
+subtree 'Build/source' of the Subversion repository.  The author index
+file used is not maintained in either Git or Subversion but can be
+provided on request.
+
+   The initial checkout was done by invoking
+     git svn --authors-file usermap clone svn://USER@tug.org/texlive/trunk/Build/source
+
+where the 'usermap' file maps Subversion user names to name and emails
+of the authors.  If no user account at <tug.org> is available, anonymous
+checkout is possible, too:
+     git svn --authors-file usermap clone svn://tug.org/texlive/trunk/Build/source
+
+   In the following, we will use _admin_ to refer to a user who has
+read/write access to the TeX Live subversion repository, and is also an
+administrator of the 'TeX-Live' Team on Github.  The above initial
+checkout has been carried out by _admin_ on the server 'texlive.info'.
+
+   On Github (<https://github.com>), a new git repository named
+'texlive-source' was created by _admin_ within the 'TeX-Live'
+"organization" (<https://github.com/TeX-Live>).  The remote was added to
+the checkout with 'git remote add origin
+git@github.com:TeX-Live/texlive-source.git'.
+
+   To automate the update on Github, a new ssh key was generated and
+added to the 'texlive-source' repository on Github as deployment key.
+This way pushes using this key can only go to the 'texlive-source'
+repository and not anywhere else.
+
+   The usage of 'git-svn' requires a strict discipline to keep a linear
+history in the master branch.  Since we are aiming at a pure mirror
+facility, we have decided to further restrict the 'master' branch of the
+'texlive-source' repository on Github to changes by _admin_.
+
+   This setup allows other developers to branch off 'master' and push
+their branches to the Github repository, but all updates need to come
+from the local 'master' (not the one on Github) to Subversion, back to
+'master' on 'texlive.info', and from there to Github.
+
+Automatic update of the Git mirror
+----------------------------------
+
+_admin_ has installed a cron job on 'texlive.info' running every 30
+minute which essentially runs 'git svn rebase' and 'git push' in the
+'master' branch of the checkout.  The first command fetches the changes
+from the Subversion repository and updates the 'master' branch with
+them, the second one pushes changes (if available) to Github.
+
+CI testing on Travis-CI
+-----------------------
+
+The 'source' tree of TeX Live contains a top-level file '.travis.yml'
+which controls the automatic testing on Travis-CI. _admin_ has
+registered to Travis-CI and allowed access to the Github's 'TeX-Live'
+organization's 'texlive-source' repository.  The default settings are to
+build the last commit of each push.  No further action is necessary on
+Travis-CI.
+
+   If changes have been pushed via the cron job above, Travis-CI will
+automatically checkout the last pushed commit and try building it.
+
+
+File: tlbuild.info,  Node: install-tl,  Next: tlmgr,  Prev: Continuous integration,  Up: Top
 
 Appendix A install-tl
 *********************
@@ -4560,6 +4639,8 @@ Index
 * --without-x:                           --without-x.          (line  6)
 * -C configure option:                   Build in parallel.    (line 11)
 * -j make option:                        Build in parallel.    (line  6)
+* .travis.yml:                           Continuous integration.
+                                                               (line 68)
 * adapting TeX Live for distros:         Distro builds.        (line 54)
 * adding a new generic library:          Adding a new generic library module.
                                                                (line  6)
@@ -4617,6 +4698,8 @@ Index
 * CC_BUILD:                              Cross problems.       (line 13)
 * chktex:                                Declarations and definitions.
                                                                (line 18)
+* ci:                                    Continuous integration.
+                                                               (line  6)
 * clisp:                                 Variables for configure.
                                                                (line 18)
 * CLISP:                                 Variables for configure.
@@ -4658,6 +4741,8 @@ Index
                                                                (line  6)
 * configuring, for cross compilation:    Cross configuring.    (line  6)
 * const:                                 Const.                (line  6)
+* continuous integration:                Continuous integration.
+                                                               (line  6)
 * conventions, coding:                   Coding conventions.   (line  6)
 * CPPFLAGS:                              Variables for configure.
                                                                (line 12)
@@ -4933,6 +5018,8 @@ Index
 * top-level directories:                 Top-level directories.
                                                                (line  6)
 * touching files to avoid rerunning:     Build system tools.   (line 39)
+* Travis-CI:                             Continuous integration.
+                                                               (line  6)
 * type cast, avoiding:                   Const.                (line 38)
 * use-commit-times, Subversion:          Build system tools.   (line 34)
 * variable declarations, in source code: Declarations and definitions.
@@ -4984,312 +5071,313 @@ Index
 
 Tag Table:
 Node: Top1208
-Node: Introduction2126
-Node: Overview of build system3881
-Node: Prerequisites5924
-Node: Building8322
-Node: Build iteration9570
-Node: Build problems10642
-Node: Build in parallel11045
-Node: Build distribution11637
-Node: Build one package12208
-Node: Installing15560
-Node: Installation directories16575
-Node: Linked scripts18391
-Node: Distro builds19872
-Node: Layout and infrastructure22262
-Node: Build system tools23090
-Node: Top-level directories25101
-Node: Autoconf macros27515
-Node: General setup macros28216
-Node: Macros for programs29083
-Node: Macros for compilers29895
-Node: Macros for libraries31329
-Node: Macros for library and header flags31755
-Node: Macros for Windows33635
-Node: Library modules35212
-Node: png library35701
-Node: zlib library37975
-Node: freetype library38490
-Node: kpathsea library39018
-Node: Program modules40417
-Node: t1utils package40845
-Node: xindy package41396
-Node: xdvik package42546
-Node: asymptote43619
-Node: Extending TeX Live44070
-Node: Adding a new program module44847
-Node: Adding a new generic library module48142
-Node: Adding a new TeX-specific library module50355
-Node: Configure options51042
-Node: Global configure options52424
-Node: --disable-native-texlive-build52966
-Node: --prefix --bindir ...53956
-Node: --disable-largefile54496
-Node: --disable-missing55181
-Node: --enable-compiler-warnings=LEVEL55582
-Node: --enable-cxx-runtime-hack56321
-Node: --enable-maintainer-mode56748
-Node: --enable-multiplatform57277
-Node: --enable-shared57815
-Node: --enable-silent-rules58186
-Node: --without-ln-s58642
-Node: --without-x58993
-Node: Program-specific configure options59181
-Node: --enable-PROG --disable-PROG59824
-Node: --disable-all-pkgs60101
-Node: Configure options for texk/web2c61087
-Node: Configure options for texk/bibtex-x63605
-Node: Configure options for texk/dvipdfm-x64148
-Node: Configure options for texk/dvisvgm64921
-Node: Configure options for texk/texlive65807
-Node: Configure options for texk/xdvik66228
-Node: Configure options for utils/xindy66832
-Node: Library-specific configure options67733
-Node: Configure options for kpathsea68744
-Node: Configure options for system poppler69453
-Node: Variables for configure70244
-Node: Cross compilation71672
-Node: Cross configuring72971
-Node: Cross problems74644
-Node: Coding conventions76291
-Node: Declarations and definitions77018
-Node: Const79200
-Node: install-tl81063
-Node: install-tl NAME81404
-Node: install-tl SYNOPSIS81562
-Node: install-tl DESCRIPTION81770
-Node: install-tl REFERENCES82771
-Node: install-tl OPTIONS83287
-Ref: install-tl *-gui* [[=]_module_]83641
-Ref: install-tl text83850
-Ref: install-tl wizard83973
-Ref: install-tl perltk84127
-Ref: install-tl *-no-gui*84561
-Ref: install-tl *-lang* _llcode_84642
-Ref: install-tl *-repository* _url|path_85329
-Ref: install-tl *-select-repository*87140
-Ref: install-tl *-all-options*87576
-Ref: install-tl *-custom-bin* _path_87883
-Ref: install-tl *-debug-translation*88538
-Ref: install-tl *-force-platform* _platform_88757
-Ref: install-tl *-help*, *--help*, *-?*89001
-Ref: install-tl *-in-place*89394
-Ref: install-tl *-logfile* _file_89921
-Ref: install-tl *-no-cls*90272
-Ref: install-tl *-non-admin*90403
-Ref: install-tl *--persistent-downloads*90508
-Ref: install-tl *--no-persistent-downloads*90536
-Ref: install-tl *-portable*91144
-Ref: install-tl *-print-platform*91283
-Ref: install-tl *-profile* _profile_91476
-Ref: install-tl *-q*92970
-Ref: install-tl *-scheme* _scheme_93032
-Ref: install-tl *-v*93506
-Ref: install-tl *-version*, *--version*93667
-Node: install-tl ENVIRONMENT VARIABLES93798
-Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK94187
-Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE94389
-Ref: install-tl TEXLIVE_INSTALL_PREFIX94495
-Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG94526
-Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME94555
-Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL94585
-Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG94619
-Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR94650
-Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR94678
-Ref: install-tl NOPERLDOC94733
-Node: install-tl AUTHORS AND COPYRIGHT94797
-Node: tlmgr95155
-Node: tlmgr NAME95592
-Node: tlmgr SYNOPSIS95717
-Node: tlmgr DESCRIPTION95907
-Node: tlmgr EXAMPLES97003
-Ref: tlmgr tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet97294
-Ref: tlmgr tlmgr update --list97475
-Ref: tlmgr tlmgr update --all97568
-Ref: tlmgr tlmgr info _pkg_97724
-Node: tlmgr OPTIONS97930
-Ref: tlmgr *--repository* _url|path_98450
-Ref: tlmgr *--gui* [_action_]99175
-Ref: tlmgr *--gui-lang* _llcode_99582
-Ref: tlmgr *--debug-translation*100265
-Ref: tlmgr *--machine-readable*100468
-Ref: tlmgr *--no-execute-actions*100736
-Ref: tlmgr *--package-logfile* _file_100929
-Ref: tlmgr *--pause*101184
-Ref: tlmgr *--persistent-downloads*101339
-Ref: tlmgr *--no-persistent-downloads*101367
-Ref: tlmgr *--pin-file*101861
-Ref: tlmgr *--usermode*102079
-Ref: tlmgr *--usertree* _dir_102199
-Node: tlmgr ACTIONS102749
-Node: tlmgr help103981
-Node: tlmgr version104457
-Node: tlmgr backup [--clean[=_N_]] [--backupdir _dir_] [--all | _pkg_]...104775
-Ref: tlmgr *--backupdir* _directory_105869
-Ref: tlmgr *--all*106066
-Ref: tlmgr *--clean*[=_N_]106288
-Ref: tlmgr *--dry-run*106585
-Node: tlmgr candidates _pkg_106705
-Ref: tlmgr *candidates _pkg_* 1106992
-Node: tlmgr check [_option_]... [files|depends|executes|runfiles|all]107136
-Ref: tlmgr *files*107579
-Ref: tlmgr *depends*107714
-Ref: tlmgr *executes*108056
-Ref: tlmgr *runfiles*108174
-Ref: tlmgr *--use-svn*108286
-Node: tlmgr conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]108403
-Node: tlmgr dump-tlpdb [--local|--remote]110475
-Ref: tlmgr *--local*110985
-Ref: tlmgr *--remote*111024
-Node: tlmgr generate [_option_]... _what_111446
-Ref: tlmgr *generate language*111687
-Ref: tlmgr *generate language.dat*111712
-Ref: tlmgr *generate language.def*111737
-Ref: tlmgr *generate language.dat.lua*111766
-Ref: tlmgr *generate fmtutil*111786
-Ref: tlmgr *--dest* _output_file_114023
-Ref: tlmgr *--localcfg* _local_conf_file_114599
-Ref: tlmgr *--rebuild-sys*114722
-Node: tlmgr gui115583
-Node: tlmgr info [_option_...] [collections|schemes|_pkg_...]115827
-Ref: tlmgr *--list*117032
-Ref: tlmgr *--only-installed*117311
-Ref: tlmgr *--taxonomy*117526
-Ref: tlmgr *--keyword*117538
-Ref: tlmgr *--functionality*117556
-Ref: tlmgr *--characterization*117577
-Node: tlmgr init-usertree117790
-Node: tlmgr install [_option_]... _pkg_...118216
-Ref: tlmgr *--file*118580
-Ref: tlmgr *--reinstall*118806
-Ref: tlmgr *--no-depends*119186
-Ref: tlmgr *--no-depends-at-all*119345
-Ref: tlmgr *--dry-run* 1119743
-Ref: tlmgr *--force*119861
-Node: tlmgr option120067
-Ref: tlmgr *option [show]*120240
-Ref: tlmgr *option showall*120258
-Ref: tlmgr *option _key_ [_value_]*120284
-Node: tlmgr paper124132
-Ref: tlmgr *paper [a4|letter]*124317
-Ref: tlmgr *[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*124391
-Node: tlmgr path [--w32mode=user|admin] [add|remove]125418
-Node: tlmgr pinning126901
-Ref: tlmgr pinning show127208
-Ref: tlmgr pinning add _repo_ _pkgglob_...127281
-Ref: tlmgr pinning remove _repo_ _pkgglob_...127400
-Ref: tlmgr pinning remove _repo_ --all127553
-Node: tlmgr platform list|add|remove _platform_...127607
-Node: tlmgr platform set _platform_127855
-Node: tlmgr platform set auto128083
-Ref: tlmgr *--dry-run* 2129200
-Node: tlmgr postaction [--w32mode=user|admin] [--fileassocmode=1|2] [--all] [install|remove] [shortcut|fileassoc|script] [_pkg_]...129309
-Node: tlmgr print-platform130611
-Node: tlmgr restore [--backupdir _dir_] [--all | _pkg_ [_rev_]]131083
-Ref: tlmgr *--all* 1131979
-Ref: tlmgr *--backupdir* _directory_ 1132173
-Ref: tlmgr *--dry-run* 3132329
-Ref: tlmgr *--force* 1132446
-Node: tlmgr remove [_option_]... _pkg_...132474
-Ref: tlmgr *--no-depends* 1132997
-Ref: tlmgr *--no-depends-at-all* 1133059
-Ref: tlmgr *--force* 2133115
-Ref: tlmgr *--dry-run* 4133587
-Node: tlmgr repository133694
-Ref: tlmgr *repository list*133902
-Ref: tlmgr *repository list _path|tag_*133932
-Ref: tlmgr *repository add _path_ [_tag_]*133965
-Ref: tlmgr *repository remove _path|tag_*133997
-Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*134051
-Node: tlmgr search [_option_...] _what_135135
-Node: tlmgr search [_option_...] --file _what_135646
-Node: tlmgr search [_option_...] --taxonomy _what_135897
-Node: tlmgr search [_option_...] --keyword _what_136208
-Node: tlmgr search [_option_...] --functionality _what_136526
-Node: tlmgr search [_option_...] --characterization _what_136864
-Node: tlmgr search [_option_...] --all _what_137204
-Ref: tlmgr *--global*137652
-Ref: tlmgr *--word*137764
-Ref: tlmgr *--list* 1138003
-Ref: tlmgr *--file* 1138349
-Ref: tlmgr *--taxonomy* 1138406
-Ref: tlmgr *--keyword* 1138418
-Ref: tlmgr *--functionality* 1138436
-Ref: tlmgr *--characterization* 1138457
-Ref: tlmgr *--all* 2138612
-Node: tlmgr uninstall138695
-Ref: tlmgr *--force* 3138949
-Node: tlmgr update [_option_]... [_pkg_]...139005
-Ref: tlmgr *--all* 3139376
-Ref: tlmgr *--self*141117
-Ref: tlmgr *--dry-run* 5141881
-Ref: tlmgr *--list* [_pkg_]142058
-Ref: tlmgr *--exclude* _pkg_142747
-Ref: tlmgr *--no-auto-remove* [_pkg_]...143440
-Ref: tlmgr *--no-auto-install* [_pkg_]...143891
-Ref: tlmgr *--reinstall-forcibly-removed*144547
-Ref: tlmgr *--backup* and *--backupdir* _directory_145111
-Ref: tlmgr *--no-depends* 2146292
-Ref: tlmgr *--no-depends-at-all* 2146495
-Ref: tlmgr *--force* 4146551
-Node: tlmgr USER MODE146977
-Node: tlmgr user mode install149788
-Node: tlmgr user mode backup; restore; remove; update150735
-Node: tlmgr user mode generate; option; paper151177
-Node: tlmgr CONFIGURATION FILE FOR TLMGR151553
-Node: tlmgr TAXONOMIES152644
-Ref: tlmgr --keyword 2153270
-Ref: tlmgr --functionality 2153355
-Ref: tlmgr --characterization 2153511
-Ref: tlmgr --taxonomy 2153652
-Node: tlmgr MULTIPLE REPOSITORIES154193
-Node: tlmgr Pinning155914
-Node: tlmgr GUI FOR TLMGR157889
-Node: tlmgr Main display159111
-Node: tlmgr Display configuration area159363
-Ref: tlmgr Status159724
-Ref: tlmgr Category159888
-Ref: tlmgr Match160074
-Ref: tlmgr Selection160334
-Ref: tlmgr Display configuration buttons160538
-Node: tlmgr Package list area160721
-Ref: tlmgr a checkbox161305
-Ref: tlmgr package name161441
-Ref: tlmgr local revision (and version)161540
-Ref: tlmgr remote revision (and version)161915
-Ref: tlmgr short description162212
-Node: tlmgr Main display action buttons162257
-Ref: tlmgr Update all installed162523
-Ref: tlmgr Update162895
-Ref: tlmgr Install162945
-Ref: tlmgr Remove163131
-Ref: tlmgr Backup163309
-Node: tlmgr Menu bar163466
-Ref: tlmgr tlmgr menu163663
-Ref: tlmgr Options menu163971
-Ref: tlmgr Actions menu165054
-Ref: tlmgr Help menu165482
-Node: tlmgr MACHINE-READABLE OUTPUT165615
-Node: tlmgr Machine-readable update and install output166425
-Ref: tlmgr location-url _location_167701
-Ref: tlmgr total-bytes _count_167917
-Ref: tlmgr _pkgname_168327
-Ref: tlmgr _status_168537
-Ref: tlmgr d168615
-Ref: tlmgr f168675
-Ref: tlmgr u168854
-Ref: tlmgr r168900
-Ref: tlmgr a169023
-Ref: tlmgr i169201
-Ref: tlmgr I169320
-Ref: tlmgr _localrev_169422
-Ref: tlmgr _serverrev_169529
-Ref: tlmgr _size_169641
-Ref: tlmgr _runtime_169810
-Ref: tlmgr _esttot_169880
-Node: tlmgr Machine-readable option output169913
-Node: tlmgr AUTHORS AND COPYRIGHT170425
-Node: Index170772
+Node: Introduction2183
+Node: Overview of build system3938
+Node: Prerequisites5981
+Node: Building8379
+Node: Build iteration9627
+Node: Build problems10699
+Node: Build in parallel11102
+Node: Build distribution11694
+Node: Build one package12265
+Node: Installing15617
+Node: Installation directories16632
+Node: Linked scripts18448
+Node: Distro builds19929
+Node: Layout and infrastructure22319
+Node: Build system tools23147
+Node: Top-level directories25158
+Node: Autoconf macros27572
+Node: General setup macros28273
+Node: Macros for programs29140
+Node: Macros for compilers29952
+Node: Macros for libraries31386
+Node: Macros for library and header flags31812
+Node: Macros for Windows33692
+Node: Library modules35269
+Node: png library35758
+Node: zlib library38032
+Node: freetype library38547
+Node: kpathsea library39075
+Node: Program modules40474
+Node: t1utils package40902
+Node: xindy package41453
+Node: xdvik package42603
+Node: asymptote43676
+Node: Extending TeX Live44127
+Node: Adding a new program module44904
+Node: Adding a new generic library module48199
+Node: Adding a new TeX-specific library module50412
+Node: Configure options51099
+Node: Global configure options52481
+Node: --disable-native-texlive-build53023
+Node: --prefix --bindir ...54013
+Node: --disable-largefile54553
+Node: --disable-missing55238
+Node: --enable-compiler-warnings=LEVEL55639
+Node: --enable-cxx-runtime-hack56378
+Node: --enable-maintainer-mode56805
+Node: --enable-multiplatform57334
+Node: --enable-shared57872
+Node: --enable-silent-rules58243
+Node: --without-ln-s58699
+Node: --without-x59050
+Node: Program-specific configure options59238
+Node: --enable-PROG --disable-PROG59881
+Node: --disable-all-pkgs60158
+Node: Configure options for texk/web2c61144
+Node: Configure options for texk/bibtex-x63662
+Node: Configure options for texk/dvipdfm-x64205
+Node: Configure options for texk/dvisvgm64978
+Node: Configure options for texk/texlive65864
+Node: Configure options for texk/xdvik66285
+Node: Configure options for utils/xindy66889
+Node: Library-specific configure options67790
+Node: Configure options for kpathsea68801
+Node: Configure options for system poppler69510
+Node: Variables for configure70301
+Node: Cross compilation71729
+Node: Cross configuring73028
+Node: Cross problems74701
+Node: Coding conventions76348
+Node: Declarations and definitions77087
+Node: Const79269
+Node: Continuous integration81132
+Node: install-tl84666
+Node: install-tl NAME85011
+Node: install-tl SYNOPSIS85169
+Node: install-tl DESCRIPTION85377
+Node: install-tl REFERENCES86378
+Node: install-tl OPTIONS86894
+Ref: install-tl *-gui* [[=]_module_]87248
+Ref: install-tl text87457
+Ref: install-tl wizard87580
+Ref: install-tl perltk87734
+Ref: install-tl *-no-gui*88168
+Ref: install-tl *-lang* _llcode_88249
+Ref: install-tl *-repository* _url|path_88936
+Ref: install-tl *-select-repository*90747
+Ref: install-tl *-all-options*91183
+Ref: install-tl *-custom-bin* _path_91490
+Ref: install-tl *-debug-translation*92145
+Ref: install-tl *-force-platform* _platform_92364
+Ref: install-tl *-help*, *--help*, *-?*92608
+Ref: install-tl *-in-place*93001
+Ref: install-tl *-logfile* _file_93528
+Ref: install-tl *-no-cls*93879
+Ref: install-tl *-non-admin*94010
+Ref: install-tl *--persistent-downloads*94115
+Ref: install-tl *--no-persistent-downloads*94143
+Ref: install-tl *-portable*94751
+Ref: install-tl *-print-platform*94890
+Ref: install-tl *-profile* _profile_95083
+Ref: install-tl *-q*96577
+Ref: install-tl *-scheme* _scheme_96639
+Ref: install-tl *-v*97113
+Ref: install-tl *-version*, *--version*97274
+Node: install-tl ENVIRONMENT VARIABLES97405
+Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK97794
+Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE97996
+Ref: install-tl TEXLIVE_INSTALL_PREFIX98102
+Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG98133
+Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME98162
+Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL98192
+Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG98226
+Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR98257
+Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR98285
+Ref: install-tl NOPERLDOC98340
+Node: install-tl AUTHORS AND COPYRIGHT98404
+Node: tlmgr98762
+Node: tlmgr NAME99199
+Node: tlmgr SYNOPSIS99324
+Node: tlmgr DESCRIPTION99514
+Node: tlmgr EXAMPLES100610
+Ref: tlmgr tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet100901
+Ref: tlmgr tlmgr update --list101082
+Ref: tlmgr tlmgr update --all101175
+Ref: tlmgr tlmgr info _pkg_101331
+Node: tlmgr OPTIONS101537
+Ref: tlmgr *--repository* _url|path_102057
+Ref: tlmgr *--gui* [_action_]102782
+Ref: tlmgr *--gui-lang* _llcode_103189
+Ref: tlmgr *--debug-translation*103872
+Ref: tlmgr *--machine-readable*104075
+Ref: tlmgr *--no-execute-actions*104343
+Ref: tlmgr *--package-logfile* _file_104536
+Ref: tlmgr *--pause*104791
+Ref: tlmgr *--persistent-downloads*104946
+Ref: tlmgr *--no-persistent-downloads*104974
+Ref: tlmgr *--pin-file*105468
+Ref: tlmgr *--usermode*105686
+Ref: tlmgr *--usertree* _dir_105806
+Node: tlmgr ACTIONS106356
+Node: tlmgr help107588
+Node: tlmgr version108064
+Node: tlmgr backup [--clean[=_N_]] [--backupdir _dir_] [--all | _pkg_]...108382
+Ref: tlmgr *--backupdir* _directory_109476
+Ref: tlmgr *--all*109673
+Ref: tlmgr *--clean*[=_N_]109895
+Ref: tlmgr *--dry-run*110192
+Node: tlmgr candidates _pkg_110312
+Ref: tlmgr *candidates _pkg_* 1110599
+Node: tlmgr check [_option_]... [files|depends|executes|runfiles|all]110743
+Ref: tlmgr *files*111186
+Ref: tlmgr *depends*111321
+Ref: tlmgr *executes*111663
+Ref: tlmgr *runfiles*111781
+Ref: tlmgr *--use-svn*111893
+Node: tlmgr conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]112010
+Node: tlmgr dump-tlpdb [--local|--remote]114082
+Ref: tlmgr *--local*114592
+Ref: tlmgr *--remote*114631
+Node: tlmgr generate [_option_]... _what_115053
+Ref: tlmgr *generate language*115294
+Ref: tlmgr *generate language.dat*115319
+Ref: tlmgr *generate language.def*115344
+Ref: tlmgr *generate language.dat.lua*115373
+Ref: tlmgr *generate fmtutil*115393
+Ref: tlmgr *--dest* _output_file_117630
+Ref: tlmgr *--localcfg* _local_conf_file_118206
+Ref: tlmgr *--rebuild-sys*118329
+Node: tlmgr gui119190
+Node: tlmgr info [_option_...] [collections|schemes|_pkg_...]119434
+Ref: tlmgr *--list*120639
+Ref: tlmgr *--only-installed*120918
+Ref: tlmgr *--taxonomy*121133
+Ref: tlmgr *--keyword*121145
+Ref: tlmgr *--functionality*121163
+Ref: tlmgr *--characterization*121184
+Node: tlmgr init-usertree121397
+Node: tlmgr install [_option_]... _pkg_...121823
+Ref: tlmgr *--file*122187
+Ref: tlmgr *--reinstall*122413
+Ref: tlmgr *--no-depends*122793
+Ref: tlmgr *--no-depends-at-all*122952
+Ref: tlmgr *--dry-run* 1123350
+Ref: tlmgr *--force*123468
+Node: tlmgr option123674
+Ref: tlmgr *option [show]*123847
+Ref: tlmgr *option showall*123865
+Ref: tlmgr *option _key_ [_value_]*123891
+Node: tlmgr paper127739
+Ref: tlmgr *paper [a4|letter]*127924
+Ref: tlmgr *[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*127998
+Node: tlmgr path [--w32mode=user|admin] [add|remove]129025
+Node: tlmgr pinning130508
+Ref: tlmgr pinning show130815
+Ref: tlmgr pinning add _repo_ _pkgglob_...130888
+Ref: tlmgr pinning remove _repo_ _pkgglob_...131007
+Ref: tlmgr pinning remove _repo_ --all131160
+Node: tlmgr platform list|add|remove _platform_...131214
+Node: tlmgr platform set _platform_131462
+Node: tlmgr platform set auto131690
+Ref: tlmgr *--dry-run* 2132807
+Node: tlmgr postaction [--w32mode=user|admin] [--fileassocmode=1|2] [--all] [install|remove] [shortcut|fileassoc|script] [_pkg_]...132916
+Node: tlmgr print-platform134218
+Node: tlmgr restore [--backupdir _dir_] [--all | _pkg_ [_rev_]]134690
+Ref: tlmgr *--all* 1135586
+Ref: tlmgr *--backupdir* _directory_ 1135780
+Ref: tlmgr *--dry-run* 3135936
+Ref: tlmgr *--force* 1136053
+Node: tlmgr remove [_option_]... _pkg_...136081
+Ref: tlmgr *--no-depends* 1136604
+Ref: tlmgr *--no-depends-at-all* 1136666
+Ref: tlmgr *--force* 2136722
+Ref: tlmgr *--dry-run* 4137194
+Node: tlmgr repository137301
+Ref: tlmgr *repository list*137509
+Ref: tlmgr *repository list _path|tag_*137539
+Ref: tlmgr *repository add _path_ [_tag_]*137572
+Ref: tlmgr *repository remove _path|tag_*137604
+Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*137658
+Node: tlmgr search [_option_...] _what_138742
+Node: tlmgr search [_option_...] --file _what_139253
+Node: tlmgr search [_option_...] --taxonomy _what_139504
+Node: tlmgr search [_option_...] --keyword _what_139815
+Node: tlmgr search [_option_...] --functionality _what_140133
+Node: tlmgr search [_option_...] --characterization _what_140471
+Node: tlmgr search [_option_...] --all _what_140811
+Ref: tlmgr *--global*141259
+Ref: tlmgr *--word*141371
+Ref: tlmgr *--list* 1141610
+Ref: tlmgr *--file* 1141956
+Ref: tlmgr *--taxonomy* 1142013
+Ref: tlmgr *--keyword* 1142025
+Ref: tlmgr *--functionality* 1142043
+Ref: tlmgr *--characterization* 1142064
+Ref: tlmgr *--all* 2142219
+Node: tlmgr uninstall142302
+Ref: tlmgr *--force* 3142556
+Node: tlmgr update [_option_]... [_pkg_]...142612
+Ref: tlmgr *--all* 3142983
+Ref: tlmgr *--self*144724
+Ref: tlmgr *--dry-run* 5145488
+Ref: tlmgr *--list* [_pkg_]145665
+Ref: tlmgr *--exclude* _pkg_146354
+Ref: tlmgr *--no-auto-remove* [_pkg_]...147047
+Ref: tlmgr *--no-auto-install* [_pkg_]...147498
+Ref: tlmgr *--reinstall-forcibly-removed*148154
+Ref: tlmgr *--backup* and *--backupdir* _directory_148718
+Ref: tlmgr *--no-depends* 2149899
+Ref: tlmgr *--no-depends-at-all* 2150102
+Ref: tlmgr *--force* 4150158
+Node: tlmgr USER MODE150584
+Node: tlmgr user mode install153395
+Node: tlmgr user mode backup; restore; remove; update154342
+Node: tlmgr user mode generate; option; paper154784
+Node: tlmgr CONFIGURATION FILE FOR TLMGR155160
+Node: tlmgr TAXONOMIES156251
+Ref: tlmgr --keyword 2156877
+Ref: tlmgr --functionality 2156962
+Ref: tlmgr --characterization 2157118
+Ref: tlmgr --taxonomy 2157259
+Node: tlmgr MULTIPLE REPOSITORIES157800
+Node: tlmgr Pinning159521
+Node: tlmgr GUI FOR TLMGR161496
+Node: tlmgr Main display162718
+Node: tlmgr Display configuration area162970
+Ref: tlmgr Status163331
+Ref: tlmgr Category163495
+Ref: tlmgr Match163681
+Ref: tlmgr Selection163941
+Ref: tlmgr Display configuration buttons164145
+Node: tlmgr Package list area164328
+Ref: tlmgr a checkbox164912
+Ref: tlmgr package name165048
+Ref: tlmgr local revision (and version)165147
+Ref: tlmgr remote revision (and version)165522
+Ref: tlmgr short description165819
+Node: tlmgr Main display action buttons165864
+Ref: tlmgr Update all installed166130
+Ref: tlmgr Update166502
+Ref: tlmgr Install166552
+Ref: tlmgr Remove166738
+Ref: tlmgr Backup166916
+Node: tlmgr Menu bar167073
+Ref: tlmgr tlmgr menu167270
+Ref: tlmgr Options menu167578
+Ref: tlmgr Actions menu168661
+Ref: tlmgr Help menu169089
+Node: tlmgr MACHINE-READABLE OUTPUT169222
+Node: tlmgr Machine-readable update and install output170032
+Ref: tlmgr location-url _location_171308
+Ref: tlmgr total-bytes _count_171524
+Ref: tlmgr _pkgname_171934
+Ref: tlmgr _status_172144
+Ref: tlmgr d172222
+Ref: tlmgr f172282
+Ref: tlmgr u172461
+Ref: tlmgr r172507
+Ref: tlmgr a172630
+Ref: tlmgr i172808
+Ref: tlmgr I172927
+Ref: tlmgr _localrev_173029
+Ref: tlmgr _serverrev_173136
+Ref: tlmgr _size_173248
+Ref: tlmgr _runtime_173417
+Ref: tlmgr _esttot_173487
+Node: tlmgr Machine-readable option output173520
+Node: tlmgr AUTHORS AND COPYRIGHT174032
+Node: Index174379
 
 End Tag Table
diff --git a/source/doc/tlbuild.texi b/source/doc/tlbuild.texi
index 8c96b27667fc6ccd8bb501cabf102c845e77ddaf..de29edd07a29a1a8a913688b50c35b83ddc7e51d 100644
--- a/source/doc/tlbuild.texi
+++ b/source/doc/tlbuild.texi
@@ -90,6 +90,7 @@ For an overview of this manual, @pxref{Introduction}.
 * Configure options::           List of all configure options.
 * Cross compilation::           Building on host X for target Y.
 * Coding conventions::          Conventions to follow.
+* Continuous integration::      Automated build testing.
 * install-tl::                  The @TL{} installer.
 * tlmgr::                       The native @TL{} package manager.
 * Index::                       General index.
@@ -2482,47 +2483,54 @@ otherwise must be carefully analyzed to make sure that they cannot
 cause the modification of quantities supposed to be constant.
 
 
-@node Continuous Integration
-@chapter Continuous Integration
+@node Continuous integration
+@chapter Continuous integration
 
 @cindex ci
 @cindex continuous integration
+@cindex Travis-CI
 
-The sources of @TL{} are subjected to continuous integration testing on
-Travis-CI (@url{https://travis-ci.org/TeX-Live/texlive-source}) via a
-git-svn mirror of the sources that is pushed to Github
+Overview: the sources of @TL{} are subjected to continuous integration
+testing on Travis-CI
+(@url{https://travis-ci.org/TeX-Live/texlive-source}) via a git-svn
+mirror of the sources that is pushed to Github
 (@url{https://github.com/TeX-Live/texlive-source}). The git-svn mirror
-is updated (currently) at a 30min interval and only the last commit
-pushed is tested on Travis-CI.
+is updated (currently) at 30 minute intervals, and only the last
+commit pushed is tested on Travis-CI.
 
 @subheading Transfer from Subversion to Github
 
-Git-svn (@url{https://git-scm.com/docs/git-svn}) is used to check out
-the subtree @code{Build/source} of the Subversion repository. The author
-index file used is not maintained in Git or Subversion but provided on
-demand. 
+git-svn (@url{https://git-scm.com/docs/git-svn}) is used to check out
+the subtree @code{Build/source} of the Subversion repository. The
+author index file used is not maintained in either Git or Subversion
+but can be provided on request.
 
-TODO what should we do here with the author index file? It contains a
-mapping from subversion names to name/email as shown in git.
+@c TODO what should we do here with the author index file? It contains a
+@c mapping from subversion names to name/email as shown in git.
 
-The initial checkout was done by invocing
-@code{git svn --authors-file usermap clone svn://USER@tug.org/texlive/trunk/Build/source}
-where the @code{usermap} file maps subversion user names to name and
-emails of the authors. 
+The initial checkout was done by invoking
+@example
+git svn --authors-file usermap clone svn://USER@@tug.org/texlive/trunk/Build/source
+@end example
 
-TODO should we use anonymous checkout here? Should be possible!
+@noindent where the @code{usermap} file maps Subversion user names to
+name and emails of the authors. If no user account at @url{tug.org} is
+available, anonymous checkout is possible, too:
+@example
+git svn --authors-file usermap clone svn://tug.org/texlive/trunk/Build/source
+@end example
 
-In the following we will refer with @emph{admin} to a user who has
-read/write access to the \TL{} subversion repository, and an
-administrator of the \@code{TeX-Live} Team on Github. The above initial
+In the following, we will use @emph{admin} to refer to a user who has
+read/write access to the @TL{} subversion repository, and is also an
+administrator of the @code{TeX-Live} Team on Github. The above initial
 checkout has been carried out by @emph{admin} on the server
-@code{texlive.info}. 
+@code{texlive.info}.
 
-On Github (@url{https://github.com/}) a new git repository named
+On Github (@url{https://github.com}), a new git repository named
 @code{texlive-source} was created by @emph{admin} within the
-@code{TeX-Live} organization (@url{https://github.com/TeX-Live/}), the
-remote added to the checkout with
-@code{git remote add origin git@github.com:TeX-Live/texlive-source.git}.
+@code{TeX-Live} ``organization'' (@url{https://github.com/TeX-Live}).
+The remote was added to the checkout with @code{git remote add origin
+git@@github.com:TeX-Live/texlive-source.git}.
 
 To automate the update on Github, a new ssh key was generated and added
 to the @code{texlive-source} repository on Github as deployment
@@ -2535,33 +2543,33 @@ mirror facility, we have decided to further restrict the @code{master}
 branch of the @code{texlive-source} repository on Github to changes by
 @emph{admin}.
 
-This setup allows other developers to branch of @code{master} and
+This setup allows other developers to branch off @code{master} and
 push their branches to the Github repository, but all updates need to
-from the local @code{master} (not the one on Github) to Subversion and
-back to @code{master} on @code{texlive.info} and from there to Github.
-See below for setup for developers.
+come from the local @code{master} (not the one on Github) to
+Subversion, back to @code{master} on @code{texlive.info}, and from
+there to Github.
 
 @subheading Automatic update of the Git mirror
 
 @emph{admin} has installed a cron job on @code{texlive.info} running
-every 30min which basically runs @code{git svn rebase} and @code{git
-push} in the @code{master} branch of the checkout. The first command
-fetches the changes from the Subversion repository and updates the
-@code{master} branch with them, the second one pushes changes (if
-available) to Github. 
+every 30 minute which essentially runs @code{git svn rebase} and
+@code{git push} in the @code{master} branch of the checkout. The first
+command fetches the changes from the Subversion repository and updates
+the @code{master} branch with them, the second one pushes changes (if
+available) to Github.
 
 @subheading CI testing on Travis-CI
 
-The @code{source} tree of \TL{} already contains a file
+@pindex .travis.yml
+The @code{source} tree of @TL{} contains a top-level file
 @code{.travis.yml} which controls the automatic testing on
 Travis-CI. @emph{admin} has registered to Travis-CI and allowed access
 to the Github's @code{TeX-Live} organization's @code{texlive-source}
 repository. The default settings are to build the last commit of each
 push. No further action is necessary on Travis-CI.
 
-In case changes have been pushed during the cron job mentioned above,
-Travis-CI will automatically checkout the last pushed commit and try
-building it.
+If changes have been pushed via the cron job above, Travis-CI will
+automatically checkout the last pushed commit and try building it.
 
 @comment
 @comment The following needs improvement
diff --git a/source/texk/README b/source/texk/README
index 17239e183bb698c6f15e806d5986b5f220ddf7fe..e72520fe9f1ccbbc53f0abc0d4c8bf9cde5521fb 100644
--- a/source/texk/README
+++ b/source/texk/README
@@ -1,4 +1,4 @@
-$Id: README 46577 2018-02-09 05:18:14Z kakuto $
+$Id: README 46714 2018-02-22 22:32:26Z kakuto $
 Copyright 2006-2018 TeX Users Group.
 You may freely use, modify and/or distribute this file.
 
@@ -59,7 +59,7 @@ dvipos - maintained here, by us
 
 dvipsk - maintained here, by us
 
-dvisvgm 2.3.2 - checked 09feb18
+dvisvgm 2.3.3 - checked 21feb18
   http://dvisvgm.bplaced.net/Downloads
 
 gregorio 5.0.1 - checked 16apr17
@@ -69,7 +69,7 @@ gsftopk - from Paul Vojta's xdvi?
 
 kpathsea - maintained here, by us
 
-lcdf-typetools 2.106 - checked 22jun16
+lcdf-typetools 2.107 - checked 22feb18
   http://www.lcdf.org/type/
 
 makeindexk - maintained here, by us
diff --git a/source/texk/kpathsea/ChangeLog b/source/texk/kpathsea/ChangeLog
index f7d8b724a27e8a543e83fc4cb36ea7871b6bd619..f2a0ce396fec0075b49339f2ca9d844d77f9f18a 100644
--- a/source/texk/kpathsea/ChangeLog
+++ b/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,16 @@
+2018-02-21  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* xgetcwd.c: Replace LIB_FATAL2 by FATAL2.
+	Private report from Douglas McKenna, 2018/02/21.
+
+2018-02-20  Karl Berry  <karl@freefriends.org>
+
+	* progname.c (expand_symlinks): make error message on unresolvable
+	symlinks less verbose.
+	(kpathsea_selfdir): exit(1) if name cannot be resolved,
+	instead of failing an assertion. Report from Enrico Gregorio,
+	http://tug.org/pipermail/tex-live/2018-February/041052.html
+
 2018-02-17  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
 
 	* texmf.cnf ({TEXINPUTS,BIBINPUTS,max_strings}.upbibtex):
diff --git a/source/texk/kpathsea/progname.c b/source/texk/kpathsea/progname.c
index 984fceadd6ca2c736d9548fe735d0516d6d3c8d1..564aab1113ac437646d947336af531b8356ff5f6 100644
--- a/source/texk/kpathsea/progname.c
+++ b/source/texk/kpathsea/progname.c
@@ -153,8 +153,9 @@ CopyFirst (register char *a, char *b)
   strcat (a, StripFirst (b));
 }
 
-/* Returns NULL on error.  Prints intermediate results if global
-   `ll_verbose' is nonzero.  */
+/* Returns NULL on error, such as an unresolvable symlink.  Prints
+   intermediate results if global `ll_verbose' is nonzero.  Otherwise,
+   returns a pointer to a static buffer (sorry).  */
 
 #define EMPTY_STRING(s) (*(s) == 0)
 #define EX(s)           (!EMPTY_STRING (s) && strcmp (s, "/") ? "/" : "")
@@ -171,22 +172,6 @@ expand_symlinks (kpathsea kpse, char *s)
   struct stat st;
   int done;
 
-  /* Check for symlink loops.  It's difficult to check for all the
-     possibilities ourselves, so let the kernel do it.  And make it
-     conditional so that people can see where the infinite loop is
-     being caused (see engtools#1536).  */
-  /* There used to be a test for a variable |ll_loop| here, but
-     it was initialized to zero and never updated */
-  if (0) {
-    FILE *f = fopen (s, "r");
-    if (!f && errno == ELOOP) {
-      /* Not worried about other errors, we'll get to them in due course.  */
-      perror (s);
-      return NULL;
-    }
-    if (f) fclose (f);
-  }
-
   strcpy (post, s);
   strcpy (pre, "");
 
@@ -194,7 +179,7 @@ expand_symlinks (kpathsea kpse, char *s)
     CopyFirst (pre, post);
 
     if (lstat (pre, &st) != 0) {
-      fprintf (stderr, "lstat(%s) failed ...\n", pre);
+      fprintf (stderr, "lstat(%s) failed: ", pre);
       perror (pre);
       return NULL;
     }
@@ -327,14 +312,14 @@ remove_dots (kpathsea kpse, string dir)
 }
 
 /* Return directory ARGV0 comes from.  Check PATH if ARGV0 is not
-   absolute.  */
+   absolute.  If ARGV0 cannot be found (e.g., --progname=nonesuch), quit.  */
 
 string
 kpathsea_selfdir (kpathsea kpse, const_string argv0)
 {
-  string self = NULL;
   string name;
   string ret;
+  string self = NULL;
 
   if (kpathsea_absolute_p (kpse, argv0, true)) {
     self = xstrdup (argv0);
@@ -394,16 +379,23 @@ kpathsea_selfdir (kpathsea kpse, const_string argv0)
   if (!self)
     self = concat3 (".", DIR_SEP_STRING, argv0);
 
-  name = remove_dots (kpse, expand_symlinks (kpse, self));
+  /* If we can't expand symlinks (--progname=nonesuch), give up.  */
+  name = expand_symlinks (kpse, self);
+  if (!name) {
+    fprintf (stderr, "kpathsea: Can't get directory of program name: %s\n",
+             self);
+    exit (1);
+  }
+
+  /* If we have something real, we can resolve ./ and ../ elements.  */
+  name = remove_dots (kpse, name);
 
 #ifndef AMIGA
   free (self);
 #endif
 
   ret = xdirname (name);
-
   free (name);
-
   return ret;
 }
 
diff --git a/source/texk/kpathsea/xgetcwd.c b/source/texk/kpathsea/xgetcwd.c
index 0e8392f7d0e05ec542e07a3603e14a7c79464d2f..044731dbd1bd0ed9fab54a4b613511a7b78453a1 100644
--- a/source/texk/kpathsea/xgetcwd.c
+++ b/source/texk/kpathsea/xgetcwd.c
@@ -117,7 +117,7 @@ xgetcwd (void)
             }
         }
         if (!found)
-            LIB_FATAL2("No inode %d/device %d in parent directory",
+            FATAL2("No inode %d/device %d in parent directory",
                    cwd_stat.st_ino, cwd_stat.st_dev);
 
         xclosedir(parent_dir);
diff --git a/source/texk/web2c/luatexdir/luatex_svnversion.h b/source/texk/web2c/luatexdir/luatex_svnversion.h
index 6aa47910557901ade695e6826dd7283827579c85..cc6f3f4e31130a7852248bc1f1c73c3cabdfb1de 100644
--- a/source/texk/web2c/luatexdir/luatex_svnversion.h
+++ b/source/texk/web2c/luatexdir/luatex_svnversion.h
@@ -1 +1 @@
-#define luatex_svn_revision 6602
+#define luatex_svn_revision 6616
diff --git a/source/texk/web2c/mplibdir/mpmath.w b/source/texk/web2c/mplibdir/mpmath.w
index 6c0ee6d00a6a97d012e23a67e8f7dfdcef487638..772f8042bfc87382eeceeb785113d7da180c432e 100644
--- a/source/texk/web2c/mplibdir/mpmath.w
+++ b/source/texk/web2c/mplibdir/mpmath.w
@@ -1,4 +1,4 @@
-% $Id: mpmath.w 2118 2017-02-15 17:49:54Z luigi $
+% $Id$
 %
 % This file is part of MetaPost;
 % the MetaPost program is in the public domain.
diff --git a/source/texk/web2c/mplibdir/mpmathdouble.w b/source/texk/web2c/mplibdir/mpmathdouble.w
index cb14969365f799484ceae633740d8abb22b7fcd2..4834876e5c38aa31b14f5720974deb05cbe493c1 100644
--- a/source/texk/web2c/mplibdir/mpmathdouble.w
+++ b/source/texk/web2c/mplibdir/mpmathdouble.w
@@ -1,4 +1,4 @@
-% $Id: mpmathdouble.w 2118 2017-02-15 17:49:54Z luigi $
+% $Id$
 %
 % This file is part of MetaPost;
 % the MetaPost program is in the public domain.