---
 texmf-dist/doc/man/man1/fmtutil.1     |    7 +++++--
 texmf-dist/scripts/texlive/fmtutil.sh |   28 +++++++++-------------------
 2 files changed, 14 insertions(+), 21 deletions(-)

--- texlive-base-jessie.git.orig/texmf-dist/doc/man/man1/fmtutil.1
+++ texlive-base-jessie.git/texmf-dist/doc/man/man1/fmtutil.1
@@ -45,7 +45,7 @@
 no-op in TeX Live
 .TP
 .BI --enablefmt \ formatname
-ensable
+enable
 .I formatname
 in config file
 .TP
@@ -100,8 +100,11 @@
 .TP
 .I fmtutil\&.cnf
 default configuration file
+.IP "\fI/etc/texmf/fmt.d/\fP"
+Debian-specific directory for configuration file snippets
 .SH "SEE ALSO"
-.BR kpsewhich (1)
+.BR kpsewhich (1),
+\fBupdate-fmtutil\fP(1)
 .SH "BUGS"
 None known, but report any bugs found to <tex-k@tug.org> (mailing list).
 .SH "AUTHOR"
--- texlive-base-jessie.git.orig/texmf-dist/scripts/texlive/fmtutil.sh
+++ texlive-base-jessie.git/texmf-dist/scripts/texlive/fmtutil.sh
@@ -552,9 +552,11 @@
       grep -v '^ *#' "$cnf_file" | sed 's@^ *@@; s@ *$@@' | grep . | sort
       cleanup $? ;;
     edit)
-      echo "$0: fmtutil --edit is disabled in TeX Live;" >&2
-      echo "$0: use a file fmtutil-local.cnf instead." >&2
-      echo "$0: See tlmgr --help or http://tug.org/texlive/doc/tlmgr.html." >&2
+      # defined by debianize-fmtutil
+      debianEditWarnAndShow
+      #echo "$0: fmtutil --edit is disabled in TeX Live;" >&2
+      #echo "$0: use a file fmtutil-local.cnf instead." >&2
+      #echo "$0: See tlmgr --help or http://tug.org/texlive/doc/tlmgr.html." >&2
       cleanup 0 ;;
     enablefmt|disablefmt)
       $cmd $arg ;;  # does not return
@@ -566,22 +568,6 @@
       cleanup $? ;;
   esac
 
-  if test -n "$cfgmaint"; then
-    if test -z "$cfgparam"; then
-      ci=`tcfmgr --tmp $tmpdir --cmd ci --id $id`
-      if test $? = 0; then
-        if test -n "$ci"; then
-          verboseMsg "$progname: configuration file updated: \`$ci'"
-        else
-          verboseMsg "$progname: configuration file unchanged."
-        fi
-      else
-        abort "failed to update configuration file."
-      fi
-    fi
-    cleanup $?
-  fi
-
   # set up destdir:
   if test -z "$destdir"; then
     : ${MT_TEXMFVAR=`kpsewhich -var-value=TEXMFVAR`}
@@ -1007,6 +993,7 @@
 ###############################################################################
 # disablefmt(format)
 #   disables format in configuration file
+#    [ redefined by debianize-fmtutil ]
 ###############################################################################
 disablefmt()
 {
@@ -1023,6 +1010,7 @@
 ###############################################################################
 #  enablefmt(format)
 #    enables format in configuration file
+#    [ redefined by debianize-fmtutil ]
 ###############################################################################
 enablefmt()
 {
@@ -1035,5 +1023,7 @@
   (exit 0); return 0
 }
 
+. /usr/share/texlive/debian/debianize-fmtutil
+
 main ${1+"$@"}
 cleanup 0
