diff --git a/gnu-system.am b/gnu-system.am
index 62e791c299..128e64fe7e 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -620,7 +620,6 @@ dist_patch_DATA =						\
   gnu/packages/patches/tar-d_ino_in_dirent-fix.patch		\
   gnu/packages/patches/tar-skip-unreliable-tests.patch		\
   gnu/packages/patches/tcsh-fix-autotest.patch			\
-  gnu/packages/patches/teckit-cstdio.patch			\
   gnu/packages/patches/texi2html-document-encoding.patch	\
   gnu/packages/patches/texi2html-i18n.patch			\
   gnu/packages/patches/tidy-CVE-2015-5522+5523.patch		\
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 5953caa87a..8b5346a17f 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -34,6 +34,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix svn-download)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu))
 
@@ -139,27 +140,33 @@ X11-system or any other graphical user interface.")
 (define-public teckit
   (package
    (name "teckit")
-   (version "2.5.1")
+   (version "2.5.4")
    (source (origin
-            (method url-fetch)
-            (uri (list
-                  (string-append
-                   "http://scripts.sil.org/svn-view/teckit/TAGS/TECkit_"
-                   (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
-                   ".tar.gz")
-                  "http://pkgs.fedoraproject.org/repo/pkgs/teckit/TECkit_2_5_1.tar.gz/4913f71f0f42bfd9cf8f161688b35dea/TECkit_2_5_1.tar.gz"
-                  ;; This used to be the canonical URL but it vanished.
-                  ;; See <http://bugs.gnu.org/19600>.
-                  ;; (string-append
-                  ;;  "http://scripts.sil.org/svn-view/teckit/TAGS/TECkit_"
-                  ;;  (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
-                  ;;  ".tar.gz")
-                  ))
-            (sha256 (base32
-                     "0fjiwvic8mdxpkyccfp7zh26y9xnvkp0skqbyfkrjiacd191k82r"))
-            (patches (list (search-patch "teckit-cstdio.patch")))))
+            ;; Downloaded tarballs vary with each download, so we use an
+            ;; svn snapshot. The 2.5.4 release seems to be made in r128,
+            ;; but r132 updates additional files to contain the correct
+            ;; version number (r129 to r131 do not concern TRUNK).
+            (method svn-fetch)
+            (uri (svn-reference
+                   (url "https://scripts.sil.org/svn-public/teckit/TRUNK")
+                   (revision 132)))
+            (file-name (string-append name "-" version))
+            (sha256
+              (base32
+                "1xqkqgw30pb24snh46srmjs2j4zhz2dfi5pf7znia0k34mrpwivz"))))
    (build-system gnu-build-system)
    (inputs `(("zlib" ,zlib)))
+   (native-inputs
+    `(("autoconf" ,autoconf)
+      ("automake" ,automake)
+      ("libtool" ,libtool)
+      ("perl" ,perl))) ; for the tests
+   (arguments
+    `(#:phases
+      (modify-phases %standard-phases
+        (add-after 'unpack 'autogen
+          (lambda _
+            (zero? (system* "sh" "autogen.sh")))))))
    (synopsis "Toolkit for encoding conversions")
    (description
     "TECkit is a low-level toolkit intended to be used by other applications
diff --git a/gnu/packages/patches/teckit-cstdio.patch b/gnu/packages/patches/teckit-cstdio.patch
deleted file mode 100644
index d79595ed44..0000000000
--- a/gnu/packages/patches/teckit-cstdio.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- TECkit_2_5_1/source/Compiler.cpp	2008-04-07 16:21:12.000000000 +0200
-+++ TECkit_2_5_1/source/Compiler.cpp	2013-01-26 00:33:18.000000000 +0100
-@@ -29,6 +29,7 @@
- 
- #include "Compiler.h"
- 
-+#include <cstdio>
- #include <iostream>
- #include <iomanip>
- #include <algorithm>