diff --git a/gnu_parallel.changes b/gnu_parallel.changes
index d178538..e5dc0f2 100644
--- a/gnu_parallel.changes
+++ b/gnu_parallel.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Aug  8 16:42:50 UTC 2018 - jengelh@inai.de
+
+- Update to new upstream release 20180722
+  * The quoting engine has been changed. Instead of using
+    \-quoting GNU Parallel now uses '-quoting in
+    bash/ash/dash/ksh. This should improve compatibility with
+    different locales. This is a big change causing this release
+    to be alpha quality.
+  * The CPU calculation has changed. By default GNU Parallel uses
+    the number of CPU threads as the number of CPUs. This can be
+    changed to the number of CPU cores or number of CPU sockets
+    with --use-cores-instead-of-threads or
+    --use-sockets-instead-of-threads.
+  * The detected number of sockets, cores, and threads can be
+    shown with --number-of-sockets, --number-of-cores, and
+    --number-of-threads.
+
 -------------------------------------------------------------------
 Fri Jun 22 07:55:24 UTC 2018 - astieger@suse.com
 
diff --git a/gnu_parallel.spec b/gnu_parallel.spec
index 6f0b4f0..5e4aaec 100644
--- a/gnu_parallel.spec
+++ b/gnu_parallel.spec
@@ -17,7 +17,7 @@
 
 
 Name:           gnu_parallel
-Version:        20180622
+Version:        20180722
 Release:        0
 Summary:        Shell tool for executing jobs in parallel
 License:        GPL-3.0-or-later
diff --git a/parallel-20180622.tar.bz2 b/parallel-20180622.tar.bz2
deleted file mode 100644
index 1880a3e..0000000
--- a/parallel-20180622.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f2cc6ac37d0b68d90b81570c0e4be589dd8c131d204320acaa173544ad6d21d9
-size 1758233
diff --git a/parallel-20180622.tar.bz2.sig b/parallel-20180622.tar.bz2.sig
deleted file mode 100644
index 73aa5dc..0000000
--- a/parallel-20180622.tar.bz2.sig
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# To check the signature run:
-#  echo | gpg
-#  gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-20180622.tar.bz2.sig
-
-echo | gpg 2>/dev/null
-gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve $0
-exit $?
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQTwBAABCgAGBQJbKtAFAAoJENGrRRaIiIiI5+QmoLX1qeLy68xkogYNLWO4OGst
-eB+ALmofb/vrTW7Hon89Zc5VvynmPuVzqPHHWJUhB/KrsRrtYR5broYaRdpXvSXN
-swO5j9uqEYqoidamRUYbh/TgnZgQX2M9DCju42261qeUAQGGI6+edrAu0itn4beX
-VZubwdcPKYJiIMT8wypgFJAvS2pVB8X68B0QdV+p3e5Ww8kTUxQVSCmToiph5JyN
-iIgFGHqImCmMeQsvGu2t1AdbQsRHFoU0ZSFvdJtbCoA64spw0Rc5a15yrWa7fSKS
-qTgwoLcZwuGNrHYLIg/pfQoxU8DQ7Q4Lf8kdop/Ff5H2ZeN5FYRY6qpLAeA40lp4
-/YXjA2jhtP0X/fVueCoPb8eFRm6DA8u2TwUlHmiYLlmr+7VeRfuSoBnJ2V9XBC9G
-vot/s6j4n/G7mbr+isT4EAlRDWy1/OmyaOvdNEo72uf4DP2MFwZf1oruTxK3YRJ/
-iQzL2peEuBgEbmFTi31CWaJnIqiy0yfRWT7G+vshbnv6/mqYV0mbMHpZwxqeSQaN
-Vw2K6wTxqgs3pRZucY0lPRWalgsob2cK9ZK/ZATInjfx55wOexF0tNCQMZWg2QDd
-Y6IyRz9KWpBXXXXUUPzj+rMwf8TfBMg1hMt0ANMuudC7ztcXro1KEeb49rFjmUKr
-H6S7qmEsjz9cFW/fMAXByYHIJAxVoRhrWI8idPm0TEQeIABnwJYiwWzQLpmifcuz
-wHG9JiH5UsxlQfZHxofbfrrB0uFmaP/EvHWTRFY/ExkReXkWyJ13cWK2a3VdBXYV
-z5g/ITgbw3bfXZk/koRPqkLS4qrIyFhU6vUAzh57wOt658VCAbREyE2dDFbtP4Rj
-mSrb+an0oOV/tPPRZNugwN0dw7cOO+SiWrZuSade9gCnXg93p+NRHYETxkbIVUrl
-/yb6RrcdtlUDhlm0pQOrs7UvoghEFneUR+nrPf6VRU9jgfzPjIU758k5TLR6eTGs
-djuGq7aoW6dp6BcpPu/f083gA9VOXFss+r6ZKQRQhiIkQYvnmx5H/FYdfcVLJB34
-YXzhzo7Tzv04OZep0U87jlMaGIvq1JkF80R5u/fmkxxxZ8b3m2BFYoGSXnG9WxZN
-GcBegwSVTu8qPYxzYiqFq0If4WMJzn2maSZ6BY8GeAR5J0SDTWJ1RtLj+dMBR3s9
-+nvKJW7/K+tHUb/xqbjZUoACsBULFQM4bO8ojFDuSVp9Np6IHZlDBnuAEN1H51fr
-7GhC5IzU8AA1DY/3Hl1SB97yZfExMY6i8OvJaXKUkaVwGQHpgJbszaMvKXt3lELx
-8Dlhv3sCSgeV6kY/3YopZrE5BTt45PuwocLnk1tS+jD77Azv/5Ywi7MubShL1JEX
-Z2i2e3PaP/1xyZy1gpHB5/9L1bDqJAtEH+mR6G/3lKFyD14tq44A6S4qshxgBONK
-pWOVfX47vnQud/o2f61Q2xh7n/Hm30aKQqAkxE+uAMrWWASglr/XSRJGeVwyI7+a
-0lGpa99abIyGVXw5LgxzIpwPTSFZcsZjSaGN+aF0CjJFwDKWMmX3PeXN4YbH6Zlt
-55LfWpt0BHi/95CcmB0DWNsQGMgRy9WcN6vwsQByQrT5lloOuqLqwoYIn1TnGqKX
-/IxQKKhfsWt8KitNwL1LbMd4TA==
-=yPke
------END PGP SIGNATURE-----
diff --git a/parallel-20180722.tar.bz2 b/parallel-20180722.tar.bz2
new file mode 100644
index 0000000..0a2356d
--- /dev/null
+++ b/parallel-20180722.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cf0d421cd78c58741395f94f568c33a0fe409bd5f4bd45f1ae804ec2d32dc318
+size 1761384
diff --git a/parallel-20180722.tar.bz2.sig b/parallel-20180722.tar.bz2.sig
new file mode 100644
index 0000000..aa094f6
--- /dev/null
+++ b/parallel-20180722.tar.bz2.sig
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# To check the signature run:
+#  echo | gpg
+#  gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-20180722.tar.bz2.sig
+
+echo | gpg 2>/dev/null
+gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve $0
+exit $?
+
+-----BEGIN PGP SIGNATURE-----
+
+iQTwBAABCgAGBQJbVC9NAAoJENGrRRaIiIiImNwmoL3ax3psiv8mr+wA1jrTmFO4
+qVZAQlop9RGoywyGRznZVQNeDbHisNuVK3kBieSxLkdzR3P5fdriMbGGixvyfcuS
+KCwqnHsbSXmS/L4DCc2JIb4KI2EhGBZKGDggLViySr5mO43R1qTdn6psqwSWFNGf
+VNSDnnIrQE90FftTBaeCzzmG2JqZzFMxAEVnsrrYHe7ffkozCLk4D5diTdpt4lYS
+t/rCnR17PwlYAaorZ66HcrkZ4/UMz4OG0aqiigXGGB5h5o+PmAJph0u89M47CV4O
+2ZSaKkKtPGvbhtNkcru4OR0YHV0PjDHnq92fHTIPsrX3yaEK+blFaf1cPiONpXDA
+MHK/CZORbQUkeXw3rWSrH+fwMATGBBMMxFW3Ox1Dp+ALTirImZoy5XYUlYW3hi6r
+eu1JIoCyJftmZzkV1RGsbX9MWStYX0Pl2mgPDdXpkfoAYvM5WVA8xQZA3FZLQufC
+WedayJY5e7SHx/s35d2iBJwlxntj4VwbHmsxFmhNSp0u5ZwIkYYMtD9fVoRVGblS
+f4xK3nMCU1dO/FIxYHaAQ4gT/dQXHrRc53h7MMIy0I4NLEp98FJPIRMNhvONh3Gy
++lBp6r45/+43mykDKS4tcuYsdTToeAKGiI5Z1UgHfsAxp+tcPHRsvh5DIxFBv2RW
+teB+iuY81oUZta+eQbgpxYaZ5/8J5ghLVA2JVIwF+o7yhcH/Ui9w0aeNmU9Dzesj
+bbIRDsJ//CY6Iud6xAXHGfYdUmWEFb5UKAQKSpaRbWVuY3vPWMbKROw6hR+Xiuw9
+PD2sli5rMk1jYS71aGwz32DwacU1icIN4djIGN9EDCFS9+iC+uE29jZmDICaYiLr
+coO0kX2X5/sP/fSCPyrHftObV6Kj1XjNSWKwrG21BrvPNp9SO3rABHTsh14ffk4L
+CYj/5VOJhxNuoRTft2A64AoX/srlKVF0qutxmDLks2oOIdQsHh4kXzp/BTUrv/P3
+zDwIjoj1D9ISW3sn4EsAXTVWtJLXU8NSWX6Uac7q1t6yn1d8Qm4j2pYc9dA6ZR17
+nCyfVaMmS+HN9kY2HD5S6xIGrpZcngv1OTSZWvUk794ug2FspWF2ghTU2vYNOZbu
+VYmYOP0GXRW+RWL8E/4DEFp8ti5J3IUjeKIgIYGkh7mo43TveeorCzzhHhteLFnU
+yl12pTKLdVaFkbAR2kQRbdQTm1Nq2T7eWFN8lrSoXV41744gNzs4WMAZxgyHfr6t
+5/1tvwBf0F2YLJlKHkWmgUpCWHYDGph/NGcTXMlAp7+S8I15bH8aXk6urUzoCwUS
+IbVC1jcuA2662zWn9n92iWr9fLnOmFS27oCNJMMSIj3SwYg/1D9vnEk6qyrrMOIY
+4h33M8cEy6HYvFlq97WhZ7tPlHCdp6Jd0vheONxHwbGyQmoWtH6pfx55JaC3a7DO
+ybizLBevkpGB23IjbE6sR8cK8GrfW6q8F/Bd8TEk+C7AL04P2cwLMWXX/U4VT52E
+SDKHJxkkRmFMe2uiivB9rIhWjUiKL/jkyqYK+xpuhC7AVgSTjSbaufAm5VZz1/0s
+JKBqE6g01SMqLJrr/rMBuHfh6XOKgKiqZNmNIlXKm4XIFRRI6tbF0P0KytQTwvnX
+0eAynly2vqCTtlh7fKI2BSsrdA==
+=tHGG
+-----END PGP SIGNATURE-----
diff --git a/parallel-remove-nag-screen.patch b/parallel-remove-nag-screen.patch
index 41a4f82..4106775 100644
--- a/parallel-remove-nag-screen.patch
+++ b/parallel-remove-nag-screen.patch
@@ -6,27 +6,32 @@ Upstream: no
 Removes the nag screen printed to stdout.
 https://en.opensuse.org/openSUSE:Packaging_guidelines#Donation_requests
 
-Index: parallel-20170622/src/parallel
+---
+ src/parallel |    1 -
+ src/sem      |    1 -
+ 2 files changed, 2 deletions(-)
+
+Index: parallel-20180722/src/parallel
 ===================================================================
---- parallel-20170622.orig/src/parallel	2017-06-22 13:35:31.000000000 +0200
-+++ parallel-20170622/src/parallel	2017-07-07 16:54:46.209052861 +0200
-@@ -1300,7 +1300,6 @@ sub parse_options {
- 
-     if(defined $opt::eta) { $opt::progress = $opt::eta; }
-     if(defined $opt::bar) { $opt::progress = $opt::bar; }
+--- parallel-20180722.orig/src/parallel
++++ parallel-20180722/src/parallel
+@@ -1441,7 +1441,6 @@ sub parse_options {
+     # runs. If that is too much trouble for you, why not use one of
+     # the alternatives instead?  See a list in: 'man
+     # parallel_alternatives'
 -    citation_notice();
  
      parse_halt();
-     parse_sshlogin();
-Index: parallel-20170622/src/sem
-===================================================================
---- parallel-20170622.orig/src/sem	2017-06-22 13:35:31.000000000 +0200
-+++ parallel-20170622/src/sem	2017-07-07 16:54:46.209052861 +0200
-@@ -1300,7 +1300,6 @@ sub parse_options {
  
-     if(defined $opt::eta) { $opt::progress = $opt::eta; }
-     if(defined $opt::bar) { $opt::progress = $opt::bar; }
+Index: parallel-20180722/src/sem
+===================================================================
+--- parallel-20180722.orig/src/sem
++++ parallel-20180722/src/sem
+@@ -1441,7 +1441,6 @@ sub parse_options {
+     # runs. If that is too much trouble for you, why not use one of
+     # the alternatives instead?  See a list in: 'man
+     # parallel_alternatives'
 -    citation_notice();
  
      parse_halt();
-     parse_sshlogin();
+