diff --git a/coreutils-8.29.tar.xz b/coreutils-8.29.tar.xz
deleted file mode 100644
index 10910cf..0000000
--- a/coreutils-8.29.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:92d0fa1c311cacefa89853bdb53c62f4110cdfda3820346b59cbd098f40f955e
-size 5286588
diff --git a/coreutils-8.29.tar.xz.sig b/coreutils-8.29.tar.xz.sig
deleted file mode 100644
index f553d8c..0000000
--- a/coreutils-8.29.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIcBAABAgAGBQJaQ+ZxAAoJEN9v2XEwYDfZOF8P/i9zNyDAerVBh6UOyW9ijDZ5
-3vSWYzgmNNxUp0BfptJ0xqirH8tKRvgHzoy87Eu5PvmARASKOtnjc1cap885HIto
-j5LlGe2t73xoW049dIx00DwsZFo9ef/DZnaSRo96MlW1xXlHtuYTDwR9ovWt5xHx
-a+SrzG05kdZlybQ8rLlz5MFxs43IHQHZ0wudlcP2KxlP2HEtBPDto/xmOxw7jVBD
-5ZOhiTCB6Dza5QxWGCX3ij1YYEn9mmSsmp6Hp4QteskWlp6mpJEViW2GW6p3zUSe
-EqpM9beax1pRKYcBMuXBDtSCS+Sxw//ZybE/p+bY5K2T0Z8zxUd325t4oGnb8uRK
-jMBdm9SnlK9bkyouHxY3eK6XNMG/u4YZ/p4jk8QB4YdYN3t7u6aJ6443OgKDlmPF
-qfELnZdPvOA9kdC8+oLz37Z/e7HmrZXforxk00qn/GCAVxqHhzu7QbME4/Zzufwt
-bHQ2JcVqywmFfv0bI5rs/EpOYJoGOwlVFq/u6mykvzYgrFUgG171eu3SHrkFAWfA
-hWz5mL1W3x/SYg/K+ySKlGtrQ877FNSHLOVP5cDme6HgAiV9rWyah44IEDwakyDk
-yfDURjKUtNaSq9PAyGUXj4nJ4BklTIyRqiXUfIs8OK9UMPqrJsFSCxzSVAJWsuGL
-Q2dcgRAkwMwrwhzed2ot
-=QwW/
------END PGP SIGNATURE-----
diff --git a/coreutils-8.30.tar.xz b/coreutils-8.30.tar.xz
new file mode 100644
index 0000000..8b2dc38
--- /dev/null
+++ b/coreutils-8.30.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e831b3a86091496cdba720411f9748de81507798f6130adeaef872d206e1b057
+size 5359532
diff --git a/coreutils-8.30.tar.xz.sig b/coreutils-8.30.tar.xz.sig
new file mode 100644
index 0000000..f720cee
--- /dev/null
+++ b/coreutils-8.30.tar.xz.sig
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJbOYLXAAoJEN9v2XEwYDfZFRwP/1xKMtXTqCOnP3ECRze+bYnX
+GB5Mm57kcP2NXwzo62+9C+FToEfkRTALtlU95edIRlsjLGBoDvv12fsOKdsyO/c5
+7paI3NoaUFyJxby9w91mNOcgN6eR5WZ/LHm2VbTs5VFpsNcSVyHSvhiqgPXtRrVp
+ZrnUKbg9iWjn8jcJHIS7qrIO4GsoFzfhn9gVh8Xxp4AYx0btn3BwPTWCxg53Ie0p
+OgrMmMnOe3wrpwrlJOgfvpk5na7yKRt7GYsyGMaKB7OxbHlVg4UCx4LuRBnaUPZr
+QmlX37sIR/sEJne0zR4iMorPi5IsErMT39VaBDLnsAjyccbmYQ/RmFYASiM5Zijw
+d94fk+TocyDBrOMsO5fzKUID5Uf4c5vJlhCXBsPBykNiKsQTb3M7fZ+gjYrMJmoS
+4DDgAMryoB5yc2i9HcNj8WMNHy4RGIrRWxOAUZf5j2zEEVwKaRcoNosFoycUotEA
+yoWdRIwyCkVwlemVhx0zQTm8WbtFl0kkAFKTqu7uHGUGOKSS4dzTi000cJ4qHSyY
+ODrouvKgqKwB+Q7IfpQ72i6DLpTzNjLKNMipBPsSkSW+RaWC67+smo1vL9V5ZlfX
+ypzjMF++r3cRuIWG9IwAwedl/sH7iqjHwdMf4y+8sGxRzW5Oeyvx20TvqxMqRLGD
+nU0Y2GCLW7C2Idw+I5QM
+=pibq
+-----END PGP SIGNATURE-----
diff --git a/coreutils-build-timeout-as-pie.patch b/coreutils-build-timeout-as-pie.patch
index f3e9765..0633f3e 100644
--- a/coreutils-build-timeout-as-pie.patch
+++ b/coreutils-build-timeout-as-pie.patch
@@ -19,7 +19,7 @@ Index: src/local.mk
 --- src/local.mk.orig
 +++ src/local.mk
 @@ -17,7 +17,7 @@
- ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ## along with this program.  If not, see <https://www.gnu.org/licenses/>.
  
  # FIXME: once lib/ and gnulib-tests/ are also converted, hoist to Makefile.am
 -AM_CFLAGS = $(WERROR_CFLAGS)
diff --git a/coreutils-disable_tests.patch b/coreutils-disable_tests.patch
index 7315b11..298630e 100644
--- a/coreutils-disable_tests.patch
+++ b/coreutils-disable_tests.patch
@@ -6,7 +6,7 @@ Index: gnulib-tests/gnulib.mk
 ===================================================================
 --- gnulib-tests/gnulib.mk.orig
 +++ gnulib-tests/gnulib.mk
-@@ -895,10 +895,10 @@ EXTRA_DIST += test-getloadavg.c signatur
+@@ -931,10 +931,10 @@ EXTRA_DIST += test-getloadavg.c signatur
  
  ## begin gnulib module getlogin-tests
  
diff --git a/coreutils-i18n.patch b/coreutils-i18n.patch
index 127e6a2..155efb5 100644
--- a/coreutils-i18n.patch
+++ b/coreutils-i18n.patch
@@ -17,7 +17,6 @@
  tests/expand/mb.sh          |  183 ++++++++++
  tests/i18n/sort.sh          |   29 +
  tests/local.mk              |    4 
- tests/misc/cut.pl           |    7 
  tests/misc/expand.pl        |   42 ++
  tests/misc/fold.pl          |   50 ++
  tests/misc/join.pl          |   50 ++
@@ -28,7 +27,7 @@
  tests/misc/uniq.pl          |   55 +++
  tests/pr/pr-tests.pl        |   49 ++
  tests/unexpand/mb.sh        |  172 +++++++++
- 30 files changed, 3777 insertions(+), 218 deletions(-)
+ 29 files changed, 3772 insertions(+), 216 deletions(-)
  create mode 100644 lib/mbfile.c
  create mode 100644 lib/mbfile.h
  create mode 100644 m4/mbfile.m4
@@ -41,7 +40,7 @@ Index: bootstrap.conf
 ===================================================================
 --- bootstrap.conf.orig
 +++ bootstrap.conf
-@@ -154,6 +154,7 @@ gnulib_modules="
+@@ -153,6 +153,7 @@ gnulib_modules="
    maintainer-makefile
    malloc-gnu
    manywarnings
@@ -535,7 +534,7 @@ Index: src/cut.c
 +static void
 +cut_characters_or_cut_bytes_no_split (FILE *stream)
 +{
-+  size_t idx;                /* number of bytes or characters in the line so far. */
++  uintmax_t idx;                /* number of bytes or characters in the line so far. */
 +  char buf[MB_LEN_MAX + BUFSIZ];  /* For spooling a read byte sequence. */
 +  char *bufpos;                /* Next read position of BUF. */
 +  size_t buflen;        /* The length of the byte sequence in buf. */
@@ -611,7 +610,7 @@ Index: src/cut.c
 +cut_fields_mb (FILE *stream)
 +{
 +  int c;
-+  size_t field_idx;
++  uintmax_t field_idx;
 +  int found_any_selected_field;
 +  int buffer_first_field;
 +  int empty_input;
@@ -1187,7 +1186,7 @@ Index: src/expand.c
 +                    if(using_utf_locale==false && found_bom==true)
 +                    {
 +                      /*First file conatined BOM header - locale was switched to UTF
-+                      /*all subsequent files should contain BOM. */
++                       *all subsequent files should contain BOM. */
 +                      error (EXIT_FAILURE, errno, _("combination of files with and without BOM header"));
 +                    }
 +                  }
@@ -4034,7 +4033,7 @@ Index: src/unexpand.c
 +                    if(using_utf_locale==false && found_bom==true)
 +                    {
 +                      /*First file conatined BOM header - locale was switched to UTF
-+                      /*all subsequent files should contain BOM. */
++                       *all subsequent files should contain BOM. */
 +                      error (EXIT_FAILURE, errno, _("combination of files with and without BOM header"));
 +                    }
 +                  }
@@ -4763,7 +4762,7 @@ Index: tests/local.mk
 ===================================================================
 --- tests/local.mk.orig
 +++ tests/local.mk
-@@ -358,6 +358,8 @@ all_tests =					\
+@@ -362,6 +362,8 @@ all_tests =					\
    tests/misc/sort-discrim.sh			\
    tests/misc/sort-files0-from.pl		\
    tests/misc/sort-float.sh			\
@@ -4772,7 +4771,7 @@ Index: tests/local.mk
    tests/misc/sort-h-thousands-sep.sh		\
    tests/misc/sort-merge.pl			\
    tests/misc/sort-merge-fdlimit.sh		\
-@@ -553,6 +555,7 @@ all_tests =					\
+@@ -557,6 +559,7 @@ all_tests =					\
    tests/du/threshold.sh				\
    tests/du/trailing-slash.sh			\
    tests/du/two-args.sh				\
@@ -4780,7 +4779,7 @@ Index: tests/local.mk
    tests/id/gnu-zero-uids.sh			\
    tests/id/no-context.sh			\
    tests/id/context.sh				\
-@@ -695,6 +698,7 @@ all_tests =					\
+@@ -701,6 +704,7 @@ all_tests =					\
    tests/touch/read-only.sh			\
    tests/touch/relative.sh			\
    tests/touch/trailing-slash.sh			\
@@ -4788,32 +4787,6 @@ Index: tests/local.mk
    $(all_root_tests)
  
  # See tests/factor/create-test.sh.
-Index: tests/misc/cut.pl
-===================================================================
---- tests/misc/cut.pl.orig
-+++ tests/misc/cut.pl
-@@ -23,9 +23,11 @@ use strict;
- # Turn off localization of executable's output.
- @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
- 
--my $mb_locale = $ENV{LOCALE_FR_UTF8};
-+my $mb_locale;
-+# uncommented enable multibyte paths
-+$mb_locale = $ENV{LOCALE_FR_UTF8};
- ! defined $mb_locale || $mb_locale eq 'none'
--  and $mb_locale = 'C';
-+ and $mb_locale = 'C';
- 
- my $prog = 'cut';
- my $try = "Try '$prog --help' for more information.\n";
-@@ -240,6 +242,7 @@ if ($mb_locale ne 'C')
-         my @new_t = @$t;
-         my $test_name = shift @new_t;
- 
-+        next if ($test_name =~ "newline-[12][0-9]");
-         push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}];
-       }
-     push @Tests, @new;
 Index: tests/misc/expand.pl
 ===================================================================
 --- tests/misc/expand.pl.orig
diff --git a/coreutils-remove_hostname_documentation.patch b/coreutils-remove_hostname_documentation.patch
index d38fbfd..f64a72b 100644
--- a/coreutils-remove_hostname_documentation.patch
+++ b/coreutils-remove_hostname_documentation.patch
@@ -31,7 +31,7 @@ Index: doc/coreutils.texi
  * hostid invocation::            Print numeric host identifier
  * uptime invocation::            Print system uptime and load
  
-@@ -15526,7 +15524,6 @@ information.
+@@ -15558,7 +15556,6 @@ information.
  * arch invocation::             Print machine hardware name.
  * nproc invocation::            Print the number of processors.
  * uname invocation::            Print system information.
@@ -39,7 +39,7 @@ Index: doc/coreutils.texi
  * hostid invocation::           Print numeric host identifier.
  * uptime invocation::           Print system uptime and load.
  @end menu
-@@ -16370,15 +16367,6 @@ Note this is non-portable (even across G
+@@ -16402,15 +16399,6 @@ Note this is non-portable (even across G
  Print the machine hardware name (sometimes called the hardware class
  or hardware type).
  
@@ -55,7 +55,7 @@ Index: doc/coreutils.texi
  @item -p
  @itemx --processor
  @opindex -p
-@@ -16432,34 +16420,6 @@ Print the kernel version.
+@@ -16464,34 +16452,6 @@ Print the kernel version.
  
  @exitstatus
  
diff --git a/coreutils-remove_kill_documentation.patch b/coreutils-remove_kill_documentation.patch
index 44b134a..d6bab1f 100644
--- a/coreutils-remove_kill_documentation.patch
+++ b/coreutils-remove_kill_documentation.patch
@@ -33,7 +33,7 @@ Index: doc/coreutils.texi
  Delaying
  
  * sleep invocation::             Delay for a specified time
-@@ -17386,90 +17380,6 @@ the exit status of @var{command} otherwi
+@@ -17806,90 +17800,6 @@ the exit status of @var{command} otherwi
  @end display
  
  
diff --git a/coreutils-skip-gnulib-test-tls.patch b/coreutils-skip-gnulib-test-tls.patch
index f5480dd..b3e72ef 100644
--- a/coreutils-skip-gnulib-test-tls.patch
+++ b/coreutils-skip-gnulib-test-tls.patch
@@ -21,7 +21,7 @@ Index: gnulib-tests/gnulib.mk
 ===================================================================
 --- gnulib-tests/gnulib.mk.orig
 +++ gnulib-tests/gnulib.mk
-@@ -2250,9 +2250,10 @@ EXTRA_DIST += test-timespec.c macros.h
+@@ -2314,9 +2314,10 @@ EXTRA_DIST += test-timespec.c macros.h
  
  ## begin gnulib module tls-tests
  
diff --git a/coreutils-tests-shorten-extreme-factor-tests.patch b/coreutils-tests-shorten-extreme-factor-tests.patch
index 5586824..084f64e 100644
--- a/coreutils-tests-shorten-extreme-factor-tests.patch
+++ b/coreutils-tests-shorten-extreme-factor-tests.patch
@@ -16,7 +16,7 @@ Index: tests/local.mk
 ===================================================================
 --- tests/local.mk.orig
 +++ tests/local.mk
-@@ -704,14 +704,9 @@ all_tests =					\
+@@ -710,14 +710,9 @@ all_tests =					\
  # See tests/factor/create-test.sh.
  tf = tests/factor
  factor_tests = \
diff --git a/coreutils-testsuite.changes b/coreutils-testsuite.changes
index 9f17359..640195a 100644
--- a/coreutils-testsuite.changes
+++ b/coreutils-testsuite.changes
@@ -1,3 +1,114 @@
+-------------------------------------------------------------------
+Tue Jul  3 23:20:18 UTC 2018 - mail@bernhard-voelker.de
+
+- Update to 8.30:
+  * Noteworthy changes in release 8.30 (2018-07-01) [stable]
+
+  ** Bug fixes
+
+  'cp --symlink SRC DST' will again correctly validate DST.
+  If DST is a regular file and SRC is a symlink to DST,
+  then cp will no longer allow that operation to clobber DST.
+  Also with -d, if DST is a symlink, then it can always be replaced,
+  even if it points to SRC on a separate device.
+  [bugs introduced with coreutils-8.27]
+
+  'cp -n -u' and 'mv -n -u' now consistently ignore the -u option.
+  Previously, this option combination suffered from race conditions
+  that caused -u to sometimes override -n.
+  [bug introduced with coreutils-7.1]
+
+  'cp -a --no-preserve=mode' now sets appropriate default permissions
+  for non regular files like fifos and character device nodes etc.,
+  and leaves mode bits of existing files unchanged.
+  Previously it would have set executable bits on created special files,
+  and set mode bits for existing files as if they had been created.
+  [bug introduced with coreutils-8.20]
+
+  'cp --remove-destination file symlink' now removes the symlink
+  even if it can't be traversed.
+  [bug introduced with --remove-destination in fileutils-4.1.1]
+
+  ls no longer truncates the abbreviated month names that have a
+  display width between 6 and 12 inclusive.  Previously this would have
+  output ambiguous months for Arabic or Catalan locales.
+
+  'ls -aA' is now equivalent to 'ls -A', since -A now overrides -a.
+  [bug introduced in coreutils-5.3.0]
+
+  'mv -n A B' no longer suffers from a race condition that can
+  overwrite a simultaneously-created B.  This bug fix requires
+  platform support for the renameat2 or renameatx_np syscalls, found
+  in recent Linux and macOS kernels.  As a side effect, ‘mv -n A A’
+  now silently does nothing if A exists.
+  [bug introduced with coreutils-7.1]
+
+  ** Changes in behavior
+
+  'cp --force file symlink' now removes the symlink even if
+  it is self referential.
+
+  ls --color now matches file extensions case insensitively.
+
+  ** New features
+
+  cp --reflink now supports --reflink=never to enforce a standard copy.
+
+  env supports a new -v/--debug option to show verbose information about
+  each processing step.
+
+  env supports a new -S/--split-string=S option to split a single argument
+  string into multiple arguments. Used to pass multiple arguments in scripts
+  (shebang lines).
+
+  md5sum accepts a new option: --zero (-z) to delimit the output lines with a
+  NUL instead of a newline character.  This also disables file name escaping.
+  This also applies to sha*sum and b2sum.
+
+  rm --preserve-root now supports the --preserve-root=all option to
+  reject any command line argument that is mounted to a separate file system.
+
+  ** Improvements
+
+  cut supports line lengths up to the max file size on 32 bit systems.
+  Previously only offsets up to SIZE_MAX-1 were supported.
+
+  stat and tail now know about the "exfs" file system, which is a
+  version of XFS.  stat -f --format=%T now reports the file system type,
+  and tail -f uses inotify.
+
+  wc avoids redundant processing of ASCII text in multibyte locales,
+  which is especially significant on macOS.
+
+- Refresh patches (line number changes only):
+  * coreutils-build-timeout-as-pie.patch
+  * coreutils-disable_tests.patch
+  * coreutils-remove_hostname_documentation.patch
+  * coreutils-remove_kill_documentation.patch
+  * coreutils-skip-gnulib-test-tls.patch
+  * coreutils-tests-shorten-extreme-factor-tests.patch
+
+- coreutils.spec:
+  * (License): osc changed the value from "GPL-3.0+" to "GPL-3.0-or-later".
+  * (build): Make sure that parse-datetime.{c,y} ends up in debuginfo (rh#1555079).
+
+- coreutils-i18n.patch:
+  * src/exand.c,src/unexpand.c: Avoid -Wcomment warning.
+  * src/cut.c (cut_characters_or_cut_bytes_no_split): Change idx from size_t
+    to uintmax_t type to avoid a regression on i586, armv7l and ppc.
+    Compare upstream, non-MB commit:
+      https://git.sv.gnu.org/cgit/coreutils.git/commit/?id=d1a754c8272
+    (cut_fields_mb): Likewise for field_idx.
+  * tests/misc/cut.pl: Remove downstream tweaks as upstream MB tests are
+     working since a while.
+
+- coreutils.keyring: Update Assaf Gordon's GPG public key.
+
+-------------------------------------------------------------------
+Thu Feb 22 15:12:57 UTC 2018 - fvogt@suse.com
+
+- Use %license (boo#1082318)
+
 -------------------------------------------------------------------
 Thu Dec 28 18:18:20 UTC 2017 - mail@bernhard-voelker.de
 
diff --git a/coreutils-testsuite.spec b/coreutils-testsuite.spec
index 1d3757d..8e59723 100644
--- a/coreutils-testsuite.spec
+++ b/coreutils-testsuite.spec
@@ -18,10 +18,10 @@
 
 Name:           coreutils-testsuite
 Summary:        GNU Core Utilities
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:          System/Base
 Url:            http://www.gnu.org/software/coreutils/
-Version:        8.29
+Version:        8.30
 Release:        0
 
 #################################################################
@@ -197,6 +197,9 @@ touch man/*.x
 
 make all %{?_smp_mflags} V=1
 
+# make sure that parse-datetime.{c,y} ends up in debuginfo (rh#1555079)
+ln -v lib/parse-datetime.{c,y} .
+
 # ================================================
 %check
 %if "%{name}" == "coreutils-testsuite"
diff --git a/coreutils.changes b/coreutils.changes
index 1f0a1f7..640195a 100644
--- a/coreutils.changes
+++ b/coreutils.changes
@@ -1,3 +1,109 @@
+-------------------------------------------------------------------
+Tue Jul  3 23:20:18 UTC 2018 - mail@bernhard-voelker.de
+
+- Update to 8.30:
+  * Noteworthy changes in release 8.30 (2018-07-01) [stable]
+
+  ** Bug fixes
+
+  'cp --symlink SRC DST' will again correctly validate DST.
+  If DST is a regular file and SRC is a symlink to DST,
+  then cp will no longer allow that operation to clobber DST.
+  Also with -d, if DST is a symlink, then it can always be replaced,
+  even if it points to SRC on a separate device.
+  [bugs introduced with coreutils-8.27]
+
+  'cp -n -u' and 'mv -n -u' now consistently ignore the -u option.
+  Previously, this option combination suffered from race conditions
+  that caused -u to sometimes override -n.
+  [bug introduced with coreutils-7.1]
+
+  'cp -a --no-preserve=mode' now sets appropriate default permissions
+  for non regular files like fifos and character device nodes etc.,
+  and leaves mode bits of existing files unchanged.
+  Previously it would have set executable bits on created special files,
+  and set mode bits for existing files as if they had been created.
+  [bug introduced with coreutils-8.20]
+
+  'cp --remove-destination file symlink' now removes the symlink
+  even if it can't be traversed.
+  [bug introduced with --remove-destination in fileutils-4.1.1]
+
+  ls no longer truncates the abbreviated month names that have a
+  display width between 6 and 12 inclusive.  Previously this would have
+  output ambiguous months for Arabic or Catalan locales.
+
+  'ls -aA' is now equivalent to 'ls -A', since -A now overrides -a.
+  [bug introduced in coreutils-5.3.0]
+
+  'mv -n A B' no longer suffers from a race condition that can
+  overwrite a simultaneously-created B.  This bug fix requires
+  platform support for the renameat2 or renameatx_np syscalls, found
+  in recent Linux and macOS kernels.  As a side effect, ‘mv -n A A’
+  now silently does nothing if A exists.
+  [bug introduced with coreutils-7.1]
+
+  ** Changes in behavior
+
+  'cp --force file symlink' now removes the symlink even if
+  it is self referential.
+
+  ls --color now matches file extensions case insensitively.
+
+  ** New features
+
+  cp --reflink now supports --reflink=never to enforce a standard copy.
+
+  env supports a new -v/--debug option to show verbose information about
+  each processing step.
+
+  env supports a new -S/--split-string=S option to split a single argument
+  string into multiple arguments. Used to pass multiple arguments in scripts
+  (shebang lines).
+
+  md5sum accepts a new option: --zero (-z) to delimit the output lines with a
+  NUL instead of a newline character.  This also disables file name escaping.
+  This also applies to sha*sum and b2sum.
+
+  rm --preserve-root now supports the --preserve-root=all option to
+  reject any command line argument that is mounted to a separate file system.
+
+  ** Improvements
+
+  cut supports line lengths up to the max file size on 32 bit systems.
+  Previously only offsets up to SIZE_MAX-1 were supported.
+
+  stat and tail now know about the "exfs" file system, which is a
+  version of XFS.  stat -f --format=%T now reports the file system type,
+  and tail -f uses inotify.
+
+  wc avoids redundant processing of ASCII text in multibyte locales,
+  which is especially significant on macOS.
+
+- Refresh patches (line number changes only):
+  * coreutils-build-timeout-as-pie.patch
+  * coreutils-disable_tests.patch
+  * coreutils-remove_hostname_documentation.patch
+  * coreutils-remove_kill_documentation.patch
+  * coreutils-skip-gnulib-test-tls.patch
+  * coreutils-tests-shorten-extreme-factor-tests.patch
+
+- coreutils.spec:
+  * (License): osc changed the value from "GPL-3.0+" to "GPL-3.0-or-later".
+  * (build): Make sure that parse-datetime.{c,y} ends up in debuginfo (rh#1555079).
+
+- coreutils-i18n.patch:
+  * src/exand.c,src/unexpand.c: Avoid -Wcomment warning.
+  * src/cut.c (cut_characters_or_cut_bytes_no_split): Change idx from size_t
+    to uintmax_t type to avoid a regression on i586, armv7l and ppc.
+    Compare upstream, non-MB commit:
+      https://git.sv.gnu.org/cgit/coreutils.git/commit/?id=d1a754c8272
+    (cut_fields_mb): Likewise for field_idx.
+  * tests/misc/cut.pl: Remove downstream tweaks as upstream MB tests are
+     working since a while.
+
+- coreutils.keyring: Update Assaf Gordon's GPG public key.
+
 -------------------------------------------------------------------
 Thu Feb 22 15:12:57 UTC 2018 - fvogt@suse.com
 
diff --git a/coreutils.keyring b/coreutils.keyring
index 8fa0845..02b763e 100644
--- a/coreutils.keyring
+++ b/coreutils.keyring
@@ -853,18 +853,30 @@ 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
-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
+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
@@ -912,19 +924,19 @@ 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
-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
+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
@@ -935,7 +947,7 @@ LuBWzsZ2ydx9tlyM+ZobcqSAZkzLJOL9ur1PHq2YnX5JN0p3qJb5/1Wvujm5D6U1
 MPF07CxmiMGWZ3Oc8l0MiOo8GQyufWm7LN7ENHordnN75Z7ewNbkz97ICA+9AVcf
 UEMo/Gk87iyfGAFp4Q98gtiB4bWpOFcZDV06EPPgDA0YuoW/OUWbKyjcmQd8M8jd
 zVXnkxAFlv+cYATomqVvf73j36YUfBfryYTiRhQWUJCZbQFKU675sq1G7KIRx/pF
-ABEBAAGJBEQEGAEKAA8CGwIFAliA5yAFCQakew8CKcFdIAQZAQoABgUCU72fjwAK
+ABEBAAGJBEQEGAEKAA8CGwIFAlqEwTkFCQqJiKQCKcFdIAQZAQoABgUCU72fjwAK
 CRAKEbYdNle5ASdhD/42y3EcotkCqpeaSiymeKDFo0sWnOoohaN98eVNnzN5FWlC
 W5KxesHh5myxseAxqpg+W5qawOXnwz8nf3Go6+rfE8OVz71wb28Ql3wPZXsVwocW
 ZdiceUoYG1Y5fpudm9AJSIkN5mHC1yBFoyvqQlZl8JED9oxpownRP/H3Cz+ueOpS
@@ -947,17 +959,17 @@ WA1jSHeMipz9GTR2R+Vdm87zuoeWvAUKvUt6YI935T4Unga4uJoekf/1sSf4x4Nx
 Ge30J6ZghN4GysgPu/jRoQHVkCYan6+ETItvZPQ+5IPfRTGpX5qGwuRT5/uAbf78
 fe6Hf9HRy4bTskdDv7NXyJrY90BK45MTFzikjeeIQ91/8nF/uai58leWCM0Ur7lk
 IZHZcokeRgHZHt0q6dGqM1yBs7iyMUS7cCIZfiL3lIpI+JQiqzdjmtbAgTBTawkQ
-KaeU/SJyvIZePA//YU5nUGeE0oFoWhnACpM24btm5onppCyIPAdPzCoJKDJ68QCq
-V53hascxZBIEb4Dod9Zb7vVQR+rY6V/fOHNgsRf8StgtmtRdChUwwCxuFS498dy8
-KxBw0G5MzeQAoaKuaXUIIzItzT3KpNDsQH7UaJE0Ejm8uLXXB3r5Aakn3U2bRTze
-Swmcr6Ky4toOfHlwb8DwJns61219vHcnrz/cOtk9+xHRz2STUr3w//lLgMvWd3Rl
-panBZRBU4s1p/N0QxVWKzROf06IINyZuoL9HLRF4lfYO19HiXamCWPZGsw9M3IMp
-QNKKINi22jeYCfc43a5KZHLt2+FbxMRmFyli7zcc8py64PZmaWYj/shj6TTckG5b
-4ohRElyqnnoC8CAsU7dgTMPRMYFmJRHFunZRMLvi11UD+I2hlYJyqeLBEzN639r6
-KIaTN3x2IbeZqyUM4sSD/r3ErNdTDEldtkghi7XZhzoRtPHNxTdv5xwJCCJzL2oE
-OYcqn3ovgrOn5Z8ZkoCOKeGg9rlpTtEijHY63de/2cSn38dyHE3YTgocJtGqeM4q
-BQa6IYrB2Q2f77w0AuYK/8AC/CFyG08h7fkrBKsZH172JzHyNf6x7Jv0C1xz5ZRq
-6fkxXPW7VkujiRUyxvpiC9RmoMc4D5K241sRenl8+ZyFOefi3Awg6pP+mys=
-=Q/GF
+KaeU/SJyvIbMPA/+Nm6LnEE5js/SKXXT7/jHXnCYmKHbkqoZmNZxT3wAx83CxaaS
+wnrIY2D6ZMw66YTEoaVheM6dsLFsiNXdMZhmEM91rJrlBHFOkio1May2O9pxu/EP
+wZ/eqaKorAnyaiHu+9o4WGbEkprGpcr53+iiJ1ocV/dhLqlaZwQcNkn/VVDY3JND
+UNXIC1XYJIZ/WoWU1O08WegljdGa73uCwP0Dyq6JqEoQ6BoBpHNE/XVw2BGl+LQr
+COAjPK+2GAGos+15WaRFZlWC+p1o/rWyJBCaMkLYIGgxM0JLTJARNY+g8n5G8yVM
+kpXHgQLkt/TTwYfTZYo7l6ZJn4SsqfKW+EqoSf/aNiVyOTh7/O+0cUiBpUNBoWt1
+ofhHtTfuoa6iMS+yVwloiYStm57dZIk704t8Yosmku9eDnOpIMLDeEiKSDiC6uEJ
+a5DW22gLy3gGTZ8yRL0jMad+vxgGLjPWLQhFE6XaVvf+mw6Pa8PkKJaGaxYoCsVz
+eteRA3ll/h+o+XYMGlUVnslMUAcW88IYQx+gN3PFeAbjepDvA2xT2TwAL7QvPE9X
+DTLjYzDIWwxgvwPo9JwUR21GPK5UJdumIUwszSiuVAMOrlg9Kfvib6RYkco6/Pww
+QE+aaymhY6ZKb8pi8E9HUYdOe/HUoYQGD/6lUXyMsUe/mxrxSev9N6VH0pk=
+=FsuN
 -----END PGP PUBLIC KEY BLOCK-----
 
diff --git a/coreutils.spec b/coreutils.spec
index 67fe440..c6e6739 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -18,10 +18,10 @@
 
 Name:           coreutils
 Summary:        GNU Core Utilities
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:          System/Base
 Url:            http://www.gnu.org/software/coreutils/
-Version:        8.29
+Version:        8.30
 Release:        0
 
 #################################################################
@@ -197,6 +197,9 @@ touch man/*.x
 
 make all %{?_smp_mflags} V=1
 
+# make sure that parse-datetime.{c,y} ends up in debuginfo (rh#1555079)
+ln -v lib/parse-datetime.{c,y} .
+
 # ================================================
 %check
 %if "%{name}" == "coreutils-testsuite"