diff --git a/.gitignore b/.gitignore
index 803c4fb..bf3351b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /kiwi-9.17.34.tar.gz
 /kiwi-9.17.38.tar.gz
 /kiwi-9.17.41.tar.gz
+/kiwi-9.18.6.tar.gz
diff --git a/kiwi-9.12.8-use-pyxattr.patch b/kiwi-9.12.8-use-pyxattr.patch
deleted file mode 100644
index 6ee0d79..0000000
--- a/kiwi-9.12.8-use-pyxattr.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rup kiwi-9.12.8/setup.py kiwi-9.12.8-pyxattr/setup.py
---- kiwi-9.12.8/setup.py	2017-09-15 04:37:16.000000000 -0400
-+++ kiwi-9.12.8-pyxattr/setup.py	2018-02-12 16:27:35.066027551 -0500
-@@ -165,7 +165,7 @@ config = {
-     'install_requires': [
-         'docopt>=0.6.2',
-         'lxml',
--        'xattr',
-+        'pyxattr',
-         'future',
-         'six',
-         'requests',
diff --git a/kiwi.spec b/kiwi.spec
index 6fa7add..20761f6 100644
--- a/kiwi.spec
+++ b/kiwi.spec
@@ -11,18 +11,15 @@ and cloud systems like Xen, KVM, VMware, EC2 and more.
 
 
 Name:           kiwi
-Version:        9.17.41
+Version:        9.18.6
 Release:        1%{?dist}
-URL:            http://suse.github.io/kiwi/
+URL:            http://osinside.github.io/kiwi/
 Summary:        Flexible operating system image builder
 License:        GPLv3+
 # We must use the version uploaded to pypi, as it contains all the required files.
 Source0:        https://files.pythonhosted.org/packages/source/k/%{name}/%{name}-%{version}.tar.gz
 
 # Fedora-specific patches
-## Use python-pyxattr instead of python-xattr
-## TODO: Get python-xattr into Fedora
-Patch1000:      kiwi-9.12.8-use-pyxattr.patch
 ## Use buildah instead of umoci by default for OCI image builds
 ## TODO: Consider getting umoci into Fedora?
 Patch1001:      kiwi-9.17.34-use-buildah.patch
@@ -95,6 +92,7 @@ Recommends:     jing
 %ifnarch ppc64 %{ix86}
 # buildah isn't available on ppc64 or x86_32
 Requires:       buildah
+Requires:       skopeo
 %endif
 %ifarch %{arm} aarch64
 Requires:       uboot-tools
@@ -342,6 +340,10 @@ done
 # Empty metapackage
 
 %changelog
+* Mon Jul 22 2019 Neal Gompa <ngompa13@gmail.com> - 9.18.6-1
+- Upgrade to 9.18.6
+- Add skopeo as a requirement for container builds
+
 * Thu Jul 04 2019 Neal Gompa <ngompa13@gmail.com> - 9.17.41-1
 - Upgrade to 9.17.41 (RH#1713612)
 - Switch to requiring grub2 tools and modules instead of grub2-efi
diff --git a/sources b/sources
index c1a487c..ef605b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kiwi-9.17.41.tar.gz) = 8175942f2e361e14d8151a79d18c0deb32f0c6105afad22beb73013f846644245159c5e63ccb08dd09d4bc02e4567ac3b63544db3cc34701f4ce3a11da5525c3
+SHA512 (kiwi-9.18.6.tar.gz) = 2faf2b4f7e34384b270dcf626cefd322b635c525e3d405475c564d78ba9a16fc92777ce8f95f9984b7be44c426ccbcffc369475afb4c244e980502f0324f1443