diff --git a/disable-posix-crypt-test.patch b/disable-posix-crypt-test.patch
new file mode 100644
index 0000000..22fd7f2
--- /dev/null
+++ b/disable-posix-crypt-test.patch
@@ -0,0 +1,16 @@
+--- guile-2.2.4/test-suite/tests/posix.test.orig	2018-09-23 14:33:16.390759869 +0200
++++ guile-2.2.4/test-suite/tests/posix.test	2018-09-23 14:33:35.298895612 +0200
+@@ -230,12 +230,4 @@
+ (with-test-prefix "crypt"
+ 
+   (pass-if "basic usage"
+-    (string? (crypt "pass" "abcdefg")))
+-
+-  (pass-if-exception "glibc EINVAL" exception:system-error
+-    ;; This used to deadlock while trying to throw to 'system-error'.
+-    ;; This test uses the special interpretation of the salt that glibc
+-    ;; does; specifically, we pass a syntactically invalid salt here.
+-    (if (string-contains %host-type "-gnu")
+-        (crypt "pass" "$X$abc")                   ;EINVAL
+-        (throw 'unresolved))))
++    (string? (crypt "pass" "abcdefg"))))
diff --git a/disable-test-out-of-memory.patch b/disable-test-out-of-memory.patch
new file mode 100644
index 0000000..1be7344
--- /dev/null
+++ b/disable-test-out-of-memory.patch
@@ -0,0 +1,35 @@
+Index: guile-2.2.4/test-suite/standalone/Makefile.am
+===================================================================
+--- guile-2.2.4.orig/test-suite/standalone/Makefile.am
++++ guile-2.2.4/test-suite/standalone/Makefile.am
+@@ -295,7 +295,4 @@ TESTS += test-smob-mark-race
+ check_SCRIPTS += test-stack-overflow
+ TESTS += test-stack-overflow
+ 
+-check_SCRIPTS += test-out-of-memory
+-TESTS += test-out-of-memory
+-
+ EXTRA_DIST += ${check_SCRIPTS}
+Index: guile-2.2.4/test-suite/standalone/Makefile.in
+===================================================================
+--- guile-2.2.4.orig/test-suite/standalone/Makefile.in
++++ guile-2.2.4/test-suite/standalone/Makefile.in
+@@ -103,7 +103,7 @@ TESTS = test-system-cmds test-bad-identi
+ 	test-scm-c-bind-keyword-arguments$(EXEEXT) \
+ 	test-srfi-4$(EXEEXT) $(am__append_6) $(am__EXEEXT_1) \
+ 	test-smob-mark$(EXEEXT) test-smob-mark-race$(EXEEXT) \
+-	test-stack-overflow test-out-of-memory
++	test-stack-overflow
+ check_PROGRAMS = test-num2integral$(EXEEXT) test-round$(EXEEXT) \
+ 	test-foreign-object-c$(EXEEXT) test-list$(EXEEXT) \
+ 	test-unwind$(EXEEXT) test-conversion$(EXEEXT) \
+@@ -1938,8 +1938,7 @@ check_SCRIPTS = test-system-cmds test-ba
+ 	test-command-line-encoding test-command-line-encoding2 \
+ 	test-language test-guild-compile $(am__append_3) \
+ 	test-foreign-object-scm test-fast-slot-ref test-mb-regexp \
+-	test-use-srfi $(am__append_5) test-stack-overflow \
+-	test-out-of-memory
++	test-use-srfi $(am__append_5) test-stack-overflow
+ BUILT_SOURCES = $(am__append_2)
+ EXTRA_DIST = test-import-order-a.scm test-import-order-b.scm \
+ 	test-import-order-c.scm test-import-order-d.scm \
diff --git a/guile-2.2-gc_pkgconfig_private.patch b/guile-2.2-gc_pkgconfig_private.patch
new file mode 100644
index 0000000..d8d8885
--- /dev/null
+++ b/guile-2.2-gc_pkgconfig_private.patch
@@ -0,0 +1,14 @@
+--- guile-2.2.4/meta/guile-2.2.pc.in.orig	2018-11-27 17:28:06.487792308 +0100
++++ guile-2.2.4/meta/guile-2.2.pc.in	2018-11-27 17:28:26.664200511 +0100
+@@ -22,9 +22,9 @@
+ Name: GNU Guile
+ Description: GNU's Ubiquitous Intelligent Language for Extension
+ Version: @GUILE_VERSION@
+-Libs: -L${libdir} -lguile-@GUILE_EFFECTIVE_VERSION@ @BDW_GC_LIBS@
++Libs: -L${libdir} -lguile-@GUILE_EFFECTIVE_VERSION@
+ Libs.private: @LIB_CLOCK_GETTIME@ @LIBGMP@ @LIBLTDL@ @LIBFFI_LIBS@	\
+   @LIBUNISTRING@ @GUILE_LIBS@ @LIBICONV@ @LIBINTL@ @LIBSOCKET@		\
+   @SERVENT_LIB@ @HOSTENT_LIB@ @GETADDRINFO_LIB@ @INET_NTOP_LIB@		\
+-  @INET_PTON_LIB@
++  @INET_PTON_LIB@ @BDW_GC_LIBS@
+ Cflags: -I${pkgincludedir}/@GUILE_EFFECTIVE_VERSION@ @GUILE_CFLAGS@ @BDW_GC_CFLAGS@
diff --git a/guile-2.2.4.tar.xz b/guile-2.2.4.tar.xz
new file mode 100644
index 0000000..1cf3862
--- /dev/null
+++ b/guile-2.2.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d9e8b94af7b206fcf52bec6501b921bd7d0bd7a31fb7e896a35ba8253678e31e
+size 10852216
diff --git a/guile-2.2.4.tar.xz.sig b/guile-2.2.4.tar.xz.sig
new file mode 100644
index 0000000..7b06a5e
--- /dev/null
+++ b/guile-2.2.4.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEPORkVYqE/cadtAz7CQsRmT2a67UFAls52+8ACgkQCQsRmT2a
+67UANw//X1a1qmbvQDpproQA9JPjsuALKp9cZgML7RiwDyYFjzjwGPt+8oSV4Q6Q
+qfMzgtFSvW8wHXDbyraFYdDLTdSnZssdk2kR1G1hgxVQyuDDmUTrtkkA1O4ZJB5A
+bLeL4lY3LkNU221hZ70ds7r3Vn4086sXPLtcj4OOitwmdJue6Uv4jhXpwK9XioQ3
+A9J14UldbQeYIAtHModpg+ohdsq6hikRjq1Hvgat7Ay+wQCWrJ2HlfTR6sxT+wuT
+Z+U5zSjPlnW1picBYKUgeDQH5cHHB4rks0wInAs8uHx+EGPBTWGEkPC6oy3pgBHt
+WplAfJQkvyVIQyGzQTHuZz82DZpelGKDoHZ4WavVf2PD+VMOq48fB6QFlL4ZSBJR
+sO6TBw/Co/rP8Bggd2Ywr9blb9XEfaQHVu5259pBcyOR+uNXl+3ETmzxzVkLUCt3
+fp5CYMcMhUICzla7WQ8+D2/Aq6ujaom19vYepXsCUmg6yudI9u5sa9wEzyaDhGhl
+lPC6C5tc5UNXPd3fFP0h9Kk6QVRPg+inwJ+pZgbQQtkaxYutO8Q+W3R7DtVfZ2K4
+1OMaqZEIoV1D/bKK69SfTkvFdF159cvJjuDd4oXaUTDnugDpBtt6Ag3dgfxWUHGf
+mf2Qhg9+9NZ43OHOJoJxkHEtXehwAKW9ynvOGEuW8RdvX8mpPRk=
+=65nj
+-----END PGP SIGNATURE-----
diff --git a/guile-add-test-ja_JP.sjis.patch b/guile-add-test-ja_JP.sjis.patch
index 0f32238..c6ac55f 100644
--- a/guile-add-test-ja_JP.sjis.patch
+++ b/guile-add-test-ja_JP.sjis.patch
@@ -1,8 +1,8 @@
-diff --git a/test-suite/standalone/Makefile.am b/test-suite/standalone/Makefile.am
-index 3a9d8d9da..327b57262 100644
---- a/test-suite/standalone/Makefile.am
-+++ b/test-suite/standalone/Makefile.am
-@@ -172,6 +172,10 @@ TESTS += test-mb-regexp
+Index: guile-2.2.4/test-suite/standalone/Makefile.am
+===================================================================
+--- guile-2.2.4.orig/test-suite/standalone/Makefile.am
++++ guile-2.2.4/test-suite/standalone/Makefile.am
+@@ -183,6 +183,10 @@ TESTS += test-mb-regexp
  check_SCRIPTS += test-use-srfi
  TESTS += test-use-srfi
  
@@ -13,11 +13,10 @@ index 3a9d8d9da..327b57262 100644
  # test-scm-c-read
  test_scm_c_read_SOURCES = test-scm-c-read.c
  test_scm_c_read_CFLAGS = ${test_cflags}
-diff --git a/test-suite/standalone/test-ja_JP.sjis b/test-suite/standalone/test-ja_JP.sjis
-new file mode 100755
-index 000000000..2aa5ee690
+Index: guile-2.2.4/test-suite/standalone/test-ja_JP.sjis
+===================================================================
 --- /dev/null
-+++ b/test-suite/standalone/test-ja_JP.sjis
++++ guile-2.2.4/test-suite/standalone/test-ja_JP.sjis
 @@ -0,0 +1,7 @@
 +#!/bin/sh
 +# Test whether guile can run initialization code using ja_JP.sjis locale
@@ -26,11 +25,11 @@ index 000000000..2aa5ee690
 +LC_CTYPE=ja_JP.sjis
 +exec guile -q -s "$0" "$@"
 +!#
-diff --git a/test-suite/standalone/Makefile.in b/test-suite/standalone/Makefile.in
-index 0f7ef8250..2478a7cc7 100644
---- a/test-suite/standalone/Makefile.in
-+++ b/test-suite/standalone/Makefile.in
-@@ -96,7 +96,8 @@ TESTS = test-system-cmds test-bad-identifiers test-require-extension \
+Index: guile-2.2.4/test-suite/standalone/Makefile.in
+===================================================================
+--- guile-2.2.4.orig/test-suite/standalone/Makefile.in
++++ guile-2.2.4/test-suite/standalone/Makefile.in
+@@ -97,7 +97,8 @@ TESTS = test-system-cmds test-bad-identi
  	test-list$(EXEEXT) test-unwind$(EXEEXT) \
  	test-conversion$(EXEEXT) test-loose-ends$(EXEEXT) \
  	test-fast-slot-ref test-mb-regexp test-use-srfi \
@@ -40,19 +39,3 @@ index 0f7ef8250..2478a7cc7 100644
  	test-scm-take-u8vector$(EXEEXT) \
  	test-scm-to-latin1-string$(EXEEXT) test-scm-values$(EXEEXT) \
  	test-scm-c-bind-keyword-arguments$(EXEEXT) \
-@@ -1876,12 +1877,14 @@ noinst_LTLIBRARIES = $(am__append_1)
- # test-mb-regexp
- 
- # test-use-srfi
-+
-+# test-ja_JP.sjis
- check_SCRIPTS = test-system-cmds test-bad-identifiers \
- 	test-require-extension test-guile-snarf test-import-order \
- 	test-command-line-encoding test-command-line-encoding2 \
- 	test-language test-guild-compile $(am__append_3) \
- 	test-fast-slot-ref test-mb-regexp test-use-srfi \
--	$(am__append_5)
-+	test-ja_JP.sjis $(am__append_5)
- BUILT_SOURCES = $(am__append_2)
- EXTRA_DIST = test-import-order-a.scm test-import-order-b.scm \
- 	test-import-order-c.scm test-import-order-d.scm \
diff --git a/guile-rpmlintrc b/guile-rpmlintrc
index 6bf61da..fd8d93f 100644
--- a/guile-rpmlintrc
+++ b/guile-rpmlintrc
@@ -1 +1,3 @@
-addFilter("libguilereadline.* devel-file-in-non-devel-package")
\ No newline at end of file
+# guile's .go files are special
+addFilter("W: shared-lib-without-dependency-information /usr/lib64/guile*")
+addFilter("W: missing-PT_GNU_STACK-section /usr/lib64/guile*")
diff --git a/guile-use-utf8.patch b/guile-use-utf8.patch
index 4820955..d80aae8 100644
--- a/guile-use-utf8.patch
+++ b/guile-use-utf8.patch
@@ -1,8 +1,64 @@
+From c2a654b7d29f5e2f32fd1313cc80162fd0c8f992 Mon Sep 17 00:00:00 2001
+From: Mark H Weaver <mhw@netris.org>
+Date: Tue, 16 Oct 2018 02:34:18 -0400
+Subject: Use 'scm_from_utf8_{string,symbol,keyword}' for C string literals.
+
+Partial fix for <https://bugs.gnu.org/33044>.
+Reported by Tom de Vries <tdevries@suse.de>.
+
+Fix several instances of the mistake of using 'scm_from_locale_*' for C
+strings that originally came from a C string literal.  Change several
+uses of 'scm_from_latin1_*' as well, to promote the practice of writing
+code that works for arbitrary C string literals.
+
+Also add missing years to the copyright notices of changed files, based
+on the git history.
+
+* libguile/debug-malloc.c, libguile/deprecation.c, libguile/error.c,
+libguile/eval.c, libguile/expand.c, libguile/extensions.c,
+libguile/filesys.c, libguile/init.c, libguile/load.c,
+libguile/modules.c, libguile/pairs.c, libguile/posix.c,
+libguile/print.c, libguile/random.c, libguile/read.c,
+libguile/regex-posix.c, libguile/snarf.h, libguile/srfi-13.c,
+libguile/stacks.c, libguile/stime.c, libguile/strports.c,
+libguile/values.c: Use 'scm_from_utf8_*' where appropriate.
+---
+ libguile/debug-malloc.c |  5 +++--
+ libguile/deprecation.c  |  5 +++--
+ libguile/error.c        | 16 ++++++++--------
+ libguile/eval.c         | 22 ++++++++++------------
+ libguile/expand.c       | 11 +++++------
+ libguile/extensions.c   |  9 +++++----
+ libguile/filesys.c      |  6 +++---
+ libguile/init.c         |  5 +++--
+ libguile/load.c         | 37 ++++++++++++++++++++-----------------
+ libguile/modules.c      |  5 +++--
+ libguile/pairs.c        |  6 +++---
+ libguile/posix.c        |  8 +++-----
+ libguile/print.c        | 11 +++++------
+ libguile/random.c       |  9 ++++++---
+ libguile/read.c         | 17 ++++++++++-------
+ libguile/regex-posix.c  |  7 ++++---
+ libguile/snarf.h        |  8 ++++----
+ libguile/srfi-13.c      |  5 +++--
+ libguile/stacks.c       |  8 +++++---
+ libguile/stime.c        |  6 +++---
+ libguile/strports.c     |  6 +++---
+ libguile/values.c       |  5 +++--
+ 22 files changed, 115 insertions(+), 102 deletions(-)
+
 diff --git a/libguile/debug-malloc.c b/libguile/debug-malloc.c
-index fa3612de2..4dd2b5d40 100644
+index fa3612d..2f2d0ab 100644
 --- a/libguile/debug-malloc.c
 +++ b/libguile/debug-malloc.c
-@@ -221,7 +221,7 @@ SCM_DEFINE (scm_malloc_stats, "malloc-stats", 0, 0, 0,
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 2000, 2006, 2008 Free Software Foundation, Inc.
++/* Copyright (C) 2000-2002, 2004, 2006, 2008, 2009, 2018
++ *   Free Software Foundation, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public License
+@@ -221,7 +222,7 @@ SCM_DEFINE (scm_malloc_stats, "malloc-stats", 0, 0, 0,
    int i;
    for (i = 0; i < malloc_type_size + N_SEEK; ++i)
      if (malloc_type[i].key)
@@ -12,10 +68,17 @@ index fa3612de2..4dd2b5d40 100644
  		       res);
    return res;
 diff --git a/libguile/deprecation.c b/libguile/deprecation.c
-index aa50eaf8c..110884ed5 100644
+index aa50eaf..6ebe398 100644
 --- a/libguile/deprecation.c
 +++ b/libguile/deprecation.c
-@@ -117,7 +117,7 @@ SCM_DEFINE(scm_issue_deprecation_warning,
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 2001, 2006, 2010, 2011 Free Software Foundation, Inc.
++/* Copyright (C) 2001, 2005, 2006, 2009-2012, 2016, 2018
++ *   Free Software Foundation, Inc.
+  * 
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public License
+@@ -117,7 +118,7 @@ SCM_DEFINE(scm_issue_deprecation_warning,
      print_summary = 1;
    else
      {
@@ -25,9 +88,17 @@ index aa50eaf8c..110884ed5 100644
        char *c_msgs;
        while (scm_is_pair (msgs))
 diff --git a/libguile/error.c b/libguile/error.c
-index 7971046ce..c9ce0b927 100644
+index ff84f41..7a86578 100644
 --- a/libguile/error.c
 +++ b/libguile/error.c
+@@ -1,5 +1,5 @@
+-/* Copyright (C) 1995-1998, 2000, 2001, 2004, 2006, 2010, 2012-2014
+- *   Free Software Foundation, Inc.
++/* Copyright (C) 1995-1998, 2000, 2001, 2004, 2006, 2010, 2012-2016,
++ *   2018 Free Software Foundation, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public License
 @@ -58,8 +58,8 @@ scm_error (SCM key, const char *subr, const char *message, SCM args, SCM rest)
  {
    scm_error_scm 
@@ -69,10 +140,27 @@ index 7971046ce..c9ce0b927 100644
      {
        scm_error (scm_arg_type_key,
 diff --git a/libguile/eval.c b/libguile/eval.c
-index 815f7c7a7..f1c80887c 100644
+index e9ff02a..a1e7f5b 100644
 --- a/libguile/eval.c
 +++ b/libguile/eval.c
-@@ -164,15 +164,15 @@ static void error_used_before_defined (void)
+@@ -1,6 +1,4 @@
+-/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,
+- *   2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
+- * Free Software Foundation, Inc.
++/* Copyright (C) 1995-2018 Free Software Foundation, Inc.
+  * 
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public License
+@@ -197,22 +195,22 @@ env_set (SCM env, int depth, int width, SCM val)
+ 
+ static void error_missing_value (SCM proc, SCM kw)
+ {
+-  scm_error_scm (scm_from_latin1_symbol ("keyword-argument-error"), proc,
+-                 scm_from_locale_string ("Keyword argument has no value"), SCM_EOL,
++  scm_error_scm (scm_from_utf8_symbol ("keyword-argument-error"), proc,
++                 scm_from_utf8_string ("Keyword argument has no value"), SCM_EOL,
+                  scm_list_1 (kw));
+ }
  
  static void error_invalid_keyword (SCM proc, SCM obj)
  {
@@ -92,7 +180,7 @@ index 815f7c7a7..f1c80887c 100644
                   scm_list_1 (kw));
  }
  
-@@ -190,9 +190,9 @@ truncate_values (SCM x)
+@@ -230,9 +228,9 @@ truncate_values (SCM x)
          return scm_car (l);
        else
          {
@@ -106,10 +194,17 @@ index 815f7c7a7..f1c80887c 100644
                                    SCM_EOL),
                        1);
 diff --git a/libguile/expand.c b/libguile/expand.c
-index 546b1e4de..c2d87da0f 100644
+index fc7da54..f00e664 100644
 --- a/libguile/expand.c
 +++ b/libguile/expand.c
-@@ -217,7 +217,7 @@ SCM_KEYWORD (kw_rest, "rest");
+@@ -1,5 +1,4 @@
+-/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
+- * Free Software Foundation, Inc.
++/* Copyright (C) 1995-2014, 2016, 2018 Free Software Foundation, Inc.
+  * 
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public License
+@@ -217,7 +216,7 @@ SCM_KEYWORD (kw_rest, "rest");
  static void 
  syntax_error (const char* const msg, const SCM form, const SCM expr)
  {
@@ -118,7 +213,7 @@ index 546b1e4de..c2d87da0f 100644
    SCM filename = SCM_BOOL_F;
    SCM linenr = SCM_BOOL_F;
    const char *format;
-@@ -470,7 +470,7 @@ expand_cond_clauses (SCM clause, SCM rest, int elp, int alp, SCM env)
+@@ -480,7 +479,7 @@ expand_cond_clauses (SCM clause, SCM rest, int elp, int alp, SCM env)
        && scm_is_eq (CADR (clause), scm_sym_arrow)
        && alp)
      {
@@ -127,17 +222,17 @@ index 546b1e4de..c2d87da0f 100644
        SCM new_env = scm_acons (tmp, tmp, env);
        ASSERT_SYNTAX (length > 2, s_missing_recipient, clause);
        ASSERT_SYNTAX (length == 3, s_extra_expression, clause);
-@@ -1203,7 +1203,7 @@ make_exp_vtable (size_t n)
+@@ -1589,7 +1588,7 @@ make_exp_vtable (size_t n)
    
    layout = scm_string_to_symbol
      (scm_string_append (scm_make_list (scm_from_size_t (exp_nfields[n]),
 -                                       scm_from_locale_string ("pw"))));
 +                                       scm_from_utf8_string ("pw"))));
    printer = SCM_BOOL_F;
-   name = scm_from_locale_symbol (exp_names[n]);
+   name = scm_from_utf8_symbol (exp_names[n]);
    code = scm_from_size_t (n);
-@@ -1245,7 +1245,7 @@ scm_init_expand ()
-   DEFINE_NAMES (DYNLET);
+@@ -1631,7 +1630,7 @@ scm_init_expand ()
+   DEFINE_NAMES (LETREC);
  
    scm_exp_vtable_vtable =
 -    scm_make_vtable (scm_from_locale_string (SCM_VTABLE_BASE_LAYOUT "pwuwpw"),
@@ -146,10 +241,19 @@ index 546b1e4de..c2d87da0f 100644
  
    for (n = 0; n < SCM_NUM_EXPANDED_TYPES; n++)
 diff --git a/libguile/extensions.c b/libguile/extensions.c
-index 1c3d28f4a..2a649107c 100644
+index 1c3d28f..ab10893 100644
 --- a/libguile/extensions.c
 +++ b/libguile/extensions.c
-@@ -90,9 +90,9 @@ load_extension (SCM lib, SCM init)
+@@ -1,6 +1,7 @@
+ /* extensions.c - registering and loading extensions.
+  *
+- * Copyright (C) 2001, 2006, 2009, 2010, 2011 Free Software Foundation, Inc.
++ * Copyright (C) 2001, 2002, 2004, 2006, 2009-2011, 2018
++ *   Free Software Foundation, Inc.
+  * 
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public License
+@@ -90,9 +91,9 @@ load_extension (SCM lib, SCM init)
  
        scm_dynwind_begin (0);
  
@@ -161,7 +265,7 @@ index 1c3d28f4a..2a649107c 100644
        scm_dynwind_free (cinit);
  
        for (ext = head; ext; ext = ext->next)
-@@ -123,7 +123,7 @@ load_extension (SCM lib, SCM init)
+@@ -123,7 +124,7 @@ load_extension (SCM lib, SCM init)
  void
  scm_c_load_extension (const char *lib, const char *init)
  {
@@ -171,10 +275,18 @@ index 1c3d28f4a..2a649107c 100644
  
  SCM_DEFINE (scm_load_extension, "load-extension", 2, 0, 0,
 diff --git a/libguile/filesys.c b/libguile/filesys.c
-index e6e37b040..3407a47ff 100644
+index 05dd2bd..e1aeeed 100644
 --- a/libguile/filesys.c
 +++ b/libguile/filesys.c
-@@ -1923,7 +1923,7 @@ scm_init_filesys ()
+@@ -1,5 +1,5 @@
+-/* Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2006,
+- *   2009, 2010, 2011, 2012, 2013, 2014, 2016, 2017, 2018 Free Software Foundation, Inc.
++/* Copyright (C) 1996-2002, 2004, 2006, 2009-2018
++ *   Free Software Foundation, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public License
+@@ -1945,7 +1945,7 @@ scm_init_filesys ()
    scm_c_define ("X_OK", scm_from_int (X_OK));
    scm_c_define ("F_OK", scm_from_int (F_OK));
  
@@ -184,10 +296,17 @@ index e6e37b040..3407a47ff 100644
  #include "libguile/filesys.x"
  }
 diff --git a/libguile/init.c b/libguile/init.c
-index adab2b5d6..2f930f5f8 100644
+index b046685..00d2e80 100644
 --- a/libguile/init.c
 +++ b/libguile/init.c
-@@ -242,7 +242,7 @@ scm_load_startup_files ()
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 1995-2004, 2006, 2009-2014 Free Software Foundation, Inc.
++/* Copyright (C) 1995-2004, 2006, 2009-2014, 2016-2018
++ *   Free Software Foundation, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public License
+@@ -241,7 +242,7 @@ scm_load_startup_files ()
       SCM_SITE_DIR and SCM_LIBRARY_DIR when searching for the site init
       file, so we do this before loading Ice-9.  */
    SCM init_path =
@@ -197,10 +316,18 @@ index adab2b5d6..2f930f5f8 100644
    /* Load Ice-9.  */
    if (!scm_ice_9_already_loaded)
 diff --git a/libguile/load.c b/libguile/load.c
-index c2ee5093a..27389fe3e 100644
+index 7b8136a..c209812 100644
 --- a/libguile/load.c
 +++ b/libguile/load.c
-@@ -148,7 +148,7 @@ SCM_DEFINE (scm_sys_package_data_dir, "%package-data-dir", 0, 0, 0,
+@@ -1,5 +1,5 @@
+-/* Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2004, 2006, 2008,
+- *   2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
++/* Copyright (C) 1995, 1996, 1998-2001, 2004, 2006, 2008-2018
++ *   Free Software Foundation, Inc.
+  * 
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public License
+@@ -146,7 +146,7 @@ SCM_DEFINE (scm_sys_package_data_dir, "%package-data-dir", 0, 0, 0,
  	    "@samp{/usr/local/share/guile}.")
  #define FUNC_NAME s_scm_sys_package_data_dir
  {
@@ -209,7 +336,7 @@ index c2ee5093a..27389fe3e 100644
  }
  #undef FUNC_NAME
  #endif /* SCM_PKGDATA_DIR */
-@@ -160,7 +160,7 @@ SCM_DEFINE (scm_sys_library_dir, "%library-dir", 0,0,0,
+@@ -158,7 +158,7 @@ SCM_DEFINE (scm_sys_library_dir, "%library-dir", 0,0,0,
  	    "E.g., may return \"/usr/share/guile/1.3.5\".")
  #define FUNC_NAME s_scm_sys_library_dir
  {
@@ -218,7 +345,7 @@ index c2ee5093a..27389fe3e 100644
  }
  #undef FUNC_NAME
  #endif /* SCM_LIBRARY_DIR */
-@@ -186,7 +186,7 @@ SCM_DEFINE (scm_sys_global_site_dir, "%global-site-dir", 0,0,0,
+@@ -184,7 +184,7 @@ SCM_DEFINE (scm_sys_global_site_dir, "%global-site-dir", 0,0,0,
  	    "E.g., may return \"/usr/share/guile/site\".")
  #define FUNC_NAME s_scm_sys_global_site_dir
  {
@@ -227,7 +354,7 @@ index c2ee5093a..27389fe3e 100644
  }
  #undef FUNC_NAME
  #endif /* SCM_GLOBAL_SITE_DIR */
-@@ -199,7 +199,7 @@ SCM_DEFINE (scm_sys_site_ccache_dir, "%site-ccache-dir", 0,0,0,
+@@ -197,7 +197,7 @@ SCM_DEFINE (scm_sys_site_ccache_dir, "%site-ccache-dir", 0,0,0,
  	    "E.g., may return \"/usr/lib/guile/" SCM_EFFECTIVE_VERSION "/site-ccache\".")
  #define FUNC_NAME s_scm_sys_site_ccache_dir
  {
@@ -236,7 +363,7 @@ index c2ee5093a..27389fe3e 100644
  }
  #undef FUNC_NAME
  #endif /* SCM_SITE_CCACHE_DIR */
-@@ -304,6 +304,9 @@ scm_i_mirror_backslashes (char *path)
+@@ -302,6 +302,9 @@ scm_i_mirror_backslashes (char *path)
  
        while (*p)
  	{
@@ -246,7 +373,7 @@ index c2ee5093a..27389fe3e 100644
  	  if (*p == '\\')
  	    *p = '/';
  	  p++;
-@@ -333,10 +336,10 @@ scm_init_load_path ()
+@@ -331,10 +334,10 @@ scm_init_load_path ()
    else if (env)
      path = scm_parse_path (scm_from_locale_string (env), path);
    else
@@ -261,7 +388,7 @@ index c2ee5093a..27389fe3e 100644
  
    env = scm_i_mirror_backslashes (getenv ("GUILE_SYSTEM_COMPILED_PATH"));
    if (env && strcmp (env, "") == 0)
-@@ -346,8 +349,8 @@ scm_init_load_path ()
+@@ -344,8 +347,8 @@ scm_init_load_path ()
      cpath = scm_parse_path (scm_from_locale_string (env), cpath);
    else
      {
@@ -272,7 +399,7 @@ index c2ee5093a..27389fe3e 100644
      }
  
  #endif /* SCM_LIBRARY_DIR */
-@@ -954,7 +957,7 @@ SCM_DEFINE (scm_search_path, "search-path", 2, 0, 1,
+@@ -946,7 +949,7 @@ SCM_DEFINE (scm_search_path, "search-path", 2, 0, 1,
  	    {
  	      require_exts = SCM_CADR (rest);
  	      if (SCM_UNLIKELY (!scm_is_null (SCM_CDDR (rest))))
@@ -281,7 +408,7 @@ index c2ee5093a..27389fe3e 100644
  	    }
  	}
        else
-@@ -1280,10 +1283,10 @@ scm_init_eval_in_scheme (void)
+@@ -1272,10 +1275,10 @@ scm_init_eval_in_scheme (void)
    int found_stale_eval_go = 0;
  
    eval_scm = search_path (*scm_loc_load_path,
@@ -294,7 +421,7 @@ index c2ee5093a..27389fe3e 100644
                            eval_scm, &stat_source, &found_stale_eval_go);
    
    if (scm_is_true (eval_thunk))
-@@ -1340,13 +1343,13 @@ scm_init_load ()
+@@ -1333,13 +1336,13 @@ scm_init_load ()
    scm_loc_load_path = SCM_VARIABLE_LOC (scm_c_define ("%load-path", SCM_EOL));
    scm_loc_load_extensions
      = SCM_VARIABLE_LOC (scm_c_define ("%load-extensions",
@@ -311,10 +438,17 @@ index c2ee5093a..27389fe3e 100644
  
    scm_loc_compile_fallback_path
 diff --git a/libguile/modules.c b/libguile/modules.c
-index 7b42a3d43..fb8c9f61c 100644
+index bf60d4d..e4cccd2 100644
 --- a/libguile/modules.c
 +++ b/libguile/modules.c
-@@ -893,7 +893,7 @@ scm_post_boot_init_modules ()
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 1998,2000,2001,2002,2003,2004,2006,2007,2008,2009,2010,2011,2012,2018 Free Software Foundation, Inc.
++/* Copyright (C) 1998, 2000-2004, 2006-2012, 2018
++ *   Free Software Foundation, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public License
+@@ -902,7 +903,7 @@ scm_post_boot_init_modules ()
    default_duplicate_binding_procedures_var = 
      scm_c_lookup ("default-duplicate-binding-procedures");
    module_public_interface_var = scm_c_lookup ("module-public-interface");
@@ -324,9 +458,17 @@ index 7b42a3d43..fb8c9f61c 100644
    scm_module_system_booted_p = 1;
  }
 diff --git a/libguile/pairs.c b/libguile/pairs.c
-index 7d7e68c4f..ca7098fec 100644
+index cea5452..92f9cfa 100644
 --- a/libguile/pairs.c
 +++ b/libguile/pairs.c
+@@ -1,5 +1,5 @@
+-/* Copyright (C) 1995,1996,2000,2001, 2004, 2005, 2006, 2008, 2009,
+- *   2011, 2012, 2013 Free Software Foundation, Inc.
++/* Copyright (C) 1995, 1996, 2000, 2001, 2004-2006, 2008-2013,
++ *   2017, 2018 Free Software Foundation, Inc.
+  * 
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public License
 @@ -55,7 +55,7 @@ verify (SCM_BITS_DIFFER_IN_EXACTLY_ONE_BIT_POSITION		\
  void scm_error_pair_access (SCM non_pair)
  {
@@ -337,10 +479,18 @@ index 7d7e68c4f..ca7098fec 100644
    if (!running)
      {
 diff --git a/libguile/posix.c b/libguile/posix.c
-index 1443a9ead..c5e1a2867 100644
+index d820092..7ede7b7 100644
 --- a/libguile/posix.c
 +++ b/libguile/posix.c
-@@ -370,11 +370,11 @@ SCM_DEFINE (scm_getpwuid, "getpw", 0, 1, 0,
+@@ -1,6 +1,4 @@
+-/* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+- *   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013,
+- *   2014, 2016, 2017, 2018 Free Software Foundation, Inc.
++/* Copyright (C) 1995-2014, 2016-2018 Free Software Foundation, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public License
+@@ -372,11 +370,11 @@ SCM_DEFINE (scm_getpwuid, "getpw", 0, 1, 0,
    SCM_SIMPLE_VECTOR_SET(result, 3, scm_from_ulong (entry->pw_gid));
    SCM_SIMPLE_VECTOR_SET(result, 4, scm_from_locale_string (entry->pw_gecos));
    if (!entry->pw_dir)
@@ -355,13 +505,20 @@ index 1443a9ead..c5e1a2867 100644
      SCM_SIMPLE_VECTOR_SET(result, 6, scm_from_locale_string (entry->pw_shell));
    return result;
 diff --git a/libguile/print.c b/libguile/print.c
-index a5b2a845b..5201b63f8 100644
+index 24c532f..6b5b16b 100644
 --- a/libguile/print.c
 +++ b/libguile/print.c
-@@ -1681,9 +1681,9 @@ scm_init_print ()
+@@ -1,5 +1,4 @@
+-/* Copyright (C) 1995-1999, 2000, 2001, 2002, 2003, 2004, 2006, 2008,
+- *   2009, 2010, 2011, 2012, 2013, 2014, 2015, 2017 Free Software Foundation, Inc.
++/* Copyright (C) 1995-2004, 2006, 2008-2018 Free Software Foundation, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public License
+@@ -1290,9 +1289,9 @@ scm_init_print ()
+ {
+   SCM type;
  
-   scm_gc_register_root (&print_state_pool);
-   scm_gc_register_root (&scm_print_state_vtable);
 -  type = scm_make_vtable (scm_from_locale_string (SCM_PRINT_STATE_LAYOUT),
 +  type = scm_make_vtable (scm_from_utf8_string (SCM_PRINT_STATE_LAYOUT),
                            SCM_BOOL_F);
@@ -370,7 +527,7 @@ index a5b2a845b..5201b63f8 100644
    scm_print_state_vtable = type;
  
    /* Don't want to bind a wrapper class in GOOPS, so pass 0 as arg1. */
-@@ -1694,9 +1694,9 @@ scm_init_print ()
+@@ -1303,9 +1302,9 @@ scm_init_print ()
  
    scm_init_opts (scm_print_options, scm_print_opts);
    scm_print_opts[SCM_PRINT_HIGHLIGHT_PREFIX_I].val =
@@ -383,9 +540,17 @@ index a5b2a845b..5201b63f8 100644
  }
  
 diff --git a/libguile/random.c b/libguile/random.c
-index 4051d1f34..e63b3de83 100644
+index 1604b46..05147ed 100644
 --- a/libguile/random.c
 +++ b/libguile/random.c
+@@ -1,5 +1,5 @@
+-/* Copyright (C) 1999, 2000, 2001, 2003, 2005, 2006, 2009, 2010,
+- *    2012, 2013, 2014 Free Software Foundation, Inc.
++/* Copyright (C) 1999-2001, 2003, 2005, 2006, 2009, 2010, 2012-2014,
++ *   2017, 2018 Free Software Foundation, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public License
 @@ -374,7 +374,10 @@ make_rstate (scm_t_rstate *state)
   * Scheme level interface.
   */
@@ -399,9 +564,15 @@ index 4051d1f34..e63b3de83 100644
  SCM_DEFINE (scm_random, "random", 1, 1, 0, 
              (SCM n, SCM state),
 diff --git a/libguile/read.c b/libguile/read.c
-index 136e74819..aa05509fc 100644
+index 0946ff3..45bb6a7 100644
 --- a/libguile/read.c
 +++ b/libguile/read.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1995-1997, 1999-2001, 2003, 2004, 2006-2012, 2014, 2015
++/* Copyright (C) 1995-1997, 1999-2001, 2003, 2004, 2006-2012, 2014-2018
+  *   Free Software Foundation, Inc.
+  * 
+  * This library is free software; you can redistribute it and/or
 @@ -142,21 +142,21 @@ scm_i_input_error (char const *function,
  {
    SCM fn = (scm_is_string (SCM_FILENAME(port))
@@ -415,8 +586,8 @@ index 136e74819..aa05509fc 100644
 -		     scm_from_locale_string ("~A:~S:~S: ~A"),
 +		     scm_from_utf8_string ("~A:~S:~S: ~A"),
  		     scm_list_4 (fn,
- 				 scm_from_long (SCM_LINUM (port) + 1),
- 				 scm_from_int (SCM_COL (port) + 1),
+ 				 scm_sum (scm_port_line (port), SCM_INUM1),
+ 				 scm_sum (scm_port_column (port), SCM_INUM1),
 -				 scm_from_locale_string (message)));
 +				 scm_from_utf8_string (message)));
      
@@ -429,23 +600,30 @@ index 136e74819..aa05509fc 100644
  		 string,
  		 arg,
  		 SCM_BOOL_F);
-@@ -2226,7 +2226,10 @@ SCM_DEFINE (scm_file_encoding, "file-encoding", 1, 0, 0,
+@@ -2211,7 +2211,10 @@ SCM_DEFINE (scm_file_encoding, "file-encoding", 1, 0, 0,
      return SCM_BOOL_F;
    else
      {
--      s_enc = scm_from_locale_string (enc);
+-      s_enc = scm_string_upcase (scm_from_locale_string (enc));
 +      /* It's not obvious what encoding to use here, but latin1 has the
 +         advantage of never causing a decoding error, and a valid
 +         encoding name should be ASCII anyway. */
-+      s_enc = scm_from_latin1_string (enc);
++      s_enc = scm_string_upcase (scm_from_latin1_string (enc));
        return s_enc;
      }
  
 diff --git a/libguile/regex-posix.c b/libguile/regex-posix.c
-index bec0f89fb..3750e1597 100644
+index 9350fb3..d3dd6d8 100644
 --- a/libguile/regex-posix.c
 +++ b/libguile/regex-posix.c
-@@ -173,7 +173,7 @@ SCM_DEFINE (scm_make_regexp, "make-regexp", 1, 0, 1,
+@@ -1,4 +1,5 @@
+-/*	Copyright (C) 1997, 1998, 1999, 2000, 2001, 2004, 2006, 2007, 2010, 2011, 2012 Free Software Foundation, Inc.
++/* Copyright (C) 1997-2001, 2004, 2006, 2007, 2010-2012, 2018
++ *   Free Software Foundation, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public License
+@@ -173,7 +174,7 @@ SCM_DEFINE (scm_make_regexp, "make-regexp", 1, 0, 1,
        SCM errmsg = scm_regexp_error_msg (status, rx);
        scm_gc_free (rx, sizeof(regex_t), "regex");
        scm_error_scm (scm_regexp_error_key,
@@ -454,7 +632,7 @@ index bec0f89fb..3750e1597 100644
  		     errmsg,
  		     SCM_BOOL_F,
  		     scm_list_1 (pat));
-@@ -315,7 +315,7 @@ SCM_DEFINE (scm_regexp_exec, "regexp-exec", 2, 2, 0,
+@@ -304,7 +305,7 @@ SCM_DEFINE (scm_regexp_exec, "regexp-exec", 2, 2, 0,
  
    if (status != 0 && status != REG_NOMATCH)
      scm_error_scm (scm_regexp_error_key,
@@ -464,10 +642,21 @@ index bec0f89fb..3750e1597 100644
  		   SCM_BOOL_F, SCM_BOOL_F);
    return mvec;
 diff --git a/libguile/snarf.h b/libguile/snarf.h
-index 1655e2c8d..42378a775 100644
+index aafd5bd..c9c3a58 100644
 --- a/libguile/snarf.h
 +++ b/libguile/snarf.h
-@@ -219,11 +219,11 @@ SCM_SNARF_INIT(c_name = scm_from_locale_symbol (scheme_name))
+@@ -3,8 +3,8 @@
+ #ifndef SCM_SNARF_H
+ #define SCM_SNARF_H
+ 
+-/* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+- *   2004, 2006, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.
++/* Copyright (C) 1995-2004, 2006, 2009-2011, 2013, 2014, 2017, 2018
++ *   Free Software Foundation, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public License
+@@ -180,11 +180,11 @@ SCM_SNARF_INIT(c_name = scm_from_utf8_symbol (scheme_name))
  
  #define SCM_KEYWORD(c_name, scheme_name) \
  SCM_SNARF_HERE(static SCM c_name) \
@@ -482,10 +671,19 @@ index 1655e2c8d..42378a775 100644
  #define SCM_VARIABLE(c_name, scheme_name) \
  SCM_SNARF_HERE(static SCM c_name) \
 diff --git a/libguile/srfi-13.c b/libguile/srfi-13.c
-index 5c30dfe20..1c065194f 100644
+index c77cba9..3ff44fb 100644
 --- a/libguile/srfi-13.c
 +++ b/libguile/srfi-13.c
-@@ -405,7 +405,7 @@ SCM_DEFINE (scm_string_join, "string-join", 1, 2, 0,
+@@ -1,6 +1,7 @@
+ /* srfi-13.c --- SRFI-13 procedures for Guile
+  *
+- * Copyright (C) 2001, 2004, 2005, 2006, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
++ * Copyright (C) 2001, 2004-2006, 2008-2013, 2017, 2018
++ *   Free Software Foundation, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public License
+@@ -405,7 +406,7 @@ SCM_DEFINE (scm_string_join, "string-join", 1, 2, 0,
    /* Validate the delimiter and record its length.  */
    if (SCM_UNBNDP (delimiter))
      {
@@ -495,11 +693,20 @@ index 5c30dfe20..1c065194f 100644
      }
    else
 diff --git a/libguile/stacks.c b/libguile/stacks.c
-index 37a9161cd..439a97d21 100644
+index 76e10fa..c4dd317 100644
 --- a/libguile/stacks.c
 +++ b/libguile/stacks.c
-@@ -388,10 +388,10 @@ scm_init_stacks ()
-   scm_sys_stacks = scm_make_fluid ();
+@@ -1,5 +1,7 @@
+ /* A stack holds a frame chain
+- * Copyright (C) 1996,1997,2000,2001, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2017 Free Software Foundation
++ *
++ * Copyright (C) 1996, 1997, 2000, 2001, 2006-2015, 2017, 2018
++ *   Free Software Foundation
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public License
+@@ -462,10 +464,10 @@ scm_init_stacks ()
+   scm_sys_stacks = scm_make_thread_local_fluid (SCM_BOOL_F);
    scm_c_define ("%stacks", scm_sys_stacks);
    
 -  scm_stack_type = scm_make_vtable (scm_from_locale_string (SCM_STACK_LAYOUT),
@@ -512,10 +719,18 @@ index 37a9161cd..439a97d21 100644
  }
  
 diff --git a/libguile/stime.c b/libguile/stime.c
-index a5421d716..21ed6905f 100644
+index 4a78298..c5b258d 100644
 --- a/libguile/stime.c
 +++ b/libguile/stime.c
-@@ -695,7 +695,7 @@ SCM_DEFINE (scm_strftime, "strftime", 2, 0, 0,
+@@ -1,5 +1,5 @@
+-/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2003, 2004, 2005, 2006,
+- *   2007, 2008, 2009, 2011, 2013, 2014 Free Software Foundation, Inc.
++/* Copyright (C) 1995-2001, 2003-2009, 2011, 2013, 2014, 2016-2018
++ *   Free Software Foundation, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public License
+@@ -696,7 +696,7 @@ SCM_DEFINE (scm_strftime, "strftime", 2, 0, 0,
  	   some OSs, e.g., Solaris.  */
  	SCM zone =
  	  scm_string_append (scm_list_2 (zone_spec,
@@ -523,12 +738,20 @@ index a5421d716..21ed6905f 100644
 +					 scm_from_utf8_string ("0")));
  
  	have_zone = 1;
- 	SCM_CRITICAL_SECTION_START;
+         scm_pthread_mutex_lock (&tz_lock);
 diff --git a/libguile/strports.c b/libguile/strports.c
-index 18f1970b5..d8dc461d5 100644
+index 5f78785..b01282e 100644
 --- a/libguile/strports.c
 +++ b/libguile/strports.c
-@@ -544,7 +544,7 @@ static void
+@@ -1,5 +1,5 @@
+-/* Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006,
+- *   2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
++/* Copyright (C) 1995, 1996, 1998-2003, 2005, 2006, 2009-2014,
++ *   2016-2018 Free Software Foundation, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public License
+@@ -344,7 +344,7 @@ static void
  init_eval_string_var_and_k_module (void)
  {
    eval_string_var = scm_c_public_variable ("ice-9 eval-string", "eval-string");
@@ -538,10 +761,17 @@ index 18f1970b5..d8dc461d5 100644
  
  SCM_DEFINE (scm_eval_string_in_module, "eval-string", 1, 1, 0, 
 diff --git a/libguile/values.c b/libguile/values.c
-index ef27cadd1..82a784fe1 100644
+index 2b2ec3f..131784a 100644
 --- a/libguile/values.c
 +++ b/libguile/values.c
-@@ -142,7 +142,7 @@ scm_init_values (void)
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 2000, 2001, 2006, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
++/* Copyright (C) 2000, 2001, 2006, 2008, 2009, 2011-2013, 2016, 2018
++ *   Free Software Foundation, Inc.
+  * 
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public License
+@@ -141,7 +142,7 @@ scm_init_values (void)
  {
    SCM print = scm_c_define_gsubr ("%print-values", 2, 0, 0, print_values);
  
@@ -550,3 +780,5 @@ index ef27cadd1..82a784fe1 100644
  
    scm_add_feature ("values");
  
+-- 
+cgit v1.0-41-gc330
diff --git a/guile.changes b/guile.changes
index c351366..eef9ab4 100644
--- a/guile.changes
+++ b/guile.changes
@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Tue Nov 27 16:01:27 UTC 2018 - jbrielmaier@suse.de
+
+- Update to version 2.2.4:
+  Notable changes compared to 2.0.14:
+  * speed
+  * better thread and space-safety
+  * improved locale support
+  * dynamically expandable stacks
+  * many small improvements and bug fixes
+  This release brings incompatible changes to 2.0.x versions.
+  More details: /usr/share/doc/packages/guile/NEWS
+- add patches:
+  * disable-posix-crypt-test.patch: test glibc EINVAL fails
+  * disable-test-out-of-memory.patch: heap error during test
+- refresh patches:
+  * guile-2.0.14-gc_pkgconfig_private.patch: rebase on guile 2.2
+    and rename to guile-2.2-gc_pkgconfig_private.patch
+- remove patches:
+  * guile-64bit.patch
+  * guile-1.6.10-mktemp.patch
+  * guile-threads-test.patch
+  * guile-net-db-test.patch: guile doesn't fail to build anymore
+  * guile-disable-int-tests.patch: guile builds fine with glibc2.27
+- reorder patches
+- remove libguilereadline packages, as it became an extension
+
 -------------------------------------------------------------------
 Sun Oct 21 17:56:40 UTC 2018 - psimons@suse.com
 
diff --git a/guile.spec b/guile.spec
index 1b3565f..7f72587 100644
--- a/guile.spec
+++ b/guile.spec
@@ -18,14 +18,12 @@
 
 # define the name used for versioning libs and directories.
 %define guilemaj    2
-%define guilemin    0
+%define guilemin    2
 %define guilevers   %{guilemaj}.%{guilemin}
-%define libgver     22
+%define libgver     1
 %define gsuff       %{guilemaj}_%{guilemin}-%{libgver}
-%define libgreadver 18
-%define greadsuff   v-%{libgreadver}-%{libgreadver}
 Name:           guile
-Version:        %{guilevers}.14
+Version:        %{guilevers}.4
 Release:        0
 Summary:        GNU's Ubiquitous Intelligent Language for Extension
 License:        GFDL-1.3-only AND GPL-3.0-or-later AND LGPL-3.0-or-later
@@ -35,15 +33,13 @@ Source0:        https://ftp.gnu.org/gnu/guile/%{name}-%{version}.tar.xz
 Source1:        https://ftp.gnu.org/gnu/guile/%{name}-%{version}.tar.xz.sig
 Source2:        https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=guile&download=1#/%{name}.keyring
 Source3:        guile-rpmlintrc
-# suse specific
-Patch1:         guile-64bit.patch
-Patch2:         guile-1.6.10-mktemp.patch
-Patch3:         guile-threads-test.patch
-Patch4:         guile-net-db-test.patch
-Patch5:         guile-2.0.14-gc_pkgconfig_private.patch
-Patch6:         guile-disable-int-tests.patch
-Patch7:         guile-add-test-ja_JP.sjis.patch
-Patch8:         guile-use-utf8.patch
+Patch0:         guile-2.2-gc_pkgconfig_private.patch
+Patch1:         guile-add-test-ja_JP.sjis.patch
+Patch2:         guile-use-utf8.patch
+# glibc EINVAL failure
+Patch3:         disable-posix-crypt-test.patch
+# test fails always with heap error
+Patch4:         disable-test-out-of-memory.patch
 BuildRequires:  gmp-devel
 BuildRequires:  libffi-devel
 BuildRequires:  libltdl-devel
@@ -84,17 +80,6 @@ C. Guile provides a machine independent execution platform that can be
 linked in as a library when building extensible programs. This package
 contains guile modules.
 
-%package -n libguilereadline-%{greadsuff}
-Summary:        GNU's Ubiquitous Intelligent Language for Extension
-License:        GFDL-1.3-only AND GPL-3.0-or-later AND LGPL-3.0-or-later
-Group:          Development/Languages/Scheme
-
-%description -n libguilereadline-%{greadsuff}
-This is Guile, a portable, embeddable Scheme implementation written in
-C. Guile provides a machine independent execution platform that can be
-linked in as a library when building extensible programs. This package
-contains the shared libraries.
-
 %package devel
 Summary:        GNU's Ubiquitous Intelligent Language for Extension
 License:        LGPL-2.1-or-later
@@ -104,7 +89,6 @@ Requires:       gmp-devel
 Requires:       guile = %{version}
 Requires:       libffi-devel
 Requires:       libguile-%{gsuff} = %{version}
-Requires:       libguilereadline-%{greadsuff} = %{version}
 Requires:       libunistring-devel
 Requires:       ncurses-devel
 Requires:       readline-devel
@@ -119,15 +103,12 @@ linked in as a library when building extensible programs.
 
 %prep
 %setup -q
-%patch1
-%patch2
+%patch0 -p1
+%patch1 -p1
+chmod +x test-suite/standalone/test-ja_JP.sjis
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-chmod +x test-suite/standalone/test-ja_JP.sjis
-%patch8 -p1
 
 %build
 %configure \
@@ -163,8 +144,6 @@ rm -f usr/share/guile/site/slibcat.SuSEconfig
 
 %post -n libguile-%{gsuff} -p /sbin/ldconfig
 %postun -n libguile-%{gsuff} -p /sbin/ldconfig
-%post -n libguilereadline-%{greadsuff} -p /sbin/ldconfig
-%postun -n libguilereadline-%{greadsuff} -p /sbin/ldconfig
 
 %files
 %doc ABOUT-NLS AUTHORS ChangeLog GUILE-VERSION HACKING
@@ -183,11 +162,6 @@ rm -f usr/share/guile/site/slibcat.SuSEconfig
 # Own usr/share/guile/site; side effect of not doing so is slib failing to install correctly.
 %{_datadir}/%{name}
 
-%files -n libguilereadline-%{greadsuff}
-# please leave .so file here [bnc#765436]
-%{_libdir}/libguilereadline-v-%{libgreadver}.so
-%{_libdir}/libguilereadline-v-%{libgreadver}.so.%{libgreadver}*
-
 %files devel
 %{_bindir}/guile-snarf
 %{_bindir}/guile-config