diff --git a/.gitignore b/.gitignore
index f6d705e..41f2d0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ xorg-cf-files-1.0.3.tar.bz2
 /imake-1.0.6.tar.bz2
 /imake-1.0.7.tar.bz2
 /gccmakedep-1.0.3.tar.bz2
+/xorg-cf-files-1.0.6.tar.bz2
diff --git a/imake.spec b/imake.spec
index cb6cc1e..28c950a 100644
--- a/imake.spec
+++ b/imake.spec
@@ -1,23 +1,20 @@
 Summary: imake source code configuration and build system
 Name: imake
 Version: 1.0.7
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
 
-Source0: ftp://ftp.x.org/pub/individual/util/imake-1.0.7.tar.bz2
-Source1: ftp://ftp.x.org/pub/individual/util/makedepend-1.0.4.tar.bz2
-Source2: ftp://ftp.x.org/pub/individual/util/gccmakedep-1.0.3.tar.bz2
-Source3: ftp://ftp.x.org/pub/individual/util/xorg-cf-files-1.0.4.tar.bz2
-Source4: ftp://ftp.x.org/pub/individual/util/lndir-1.0.3.tar.bz2
+Source0: https://www.x.org/pub/individual/util/imake-1.0.7.tar.bz2
+Source1: https://www.x.org/pub/individual/util/makedepend-1.0.4.tar.bz2
+Source2: https://www.x.org/pub/individual/util/gccmakedep-1.0.3.tar.bz2
+Source3: https://www.x.org/pub/individual/util/xorg-cf-files-1.0.6.tar.bz2
+Source4: https://www.x.org/pub/individual/util/lndir-1.0.3.tar.bz2
+# this has been merged post 1.0.6
 Patch2: xorg-cf-files-1.0.2-redhat.patch
 Patch11: imake-1.0.2-abort.patch
 
-# upstream backports for AArch64
-Patch20: imake-backport-aarch64-1.patch
-Patch21: imake-backport-aarch64-2.patch
-
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
@@ -42,10 +39,6 @@ migrate software to the GNU autotools system.
 pushd %{name}-%{version}
 %patch11 -p1 -b .abort
 popd
-pushd xorg-cf-files-1.0.4
-%patch20 -p1
-%patch21 -p1
-popd
 
 %build
 # Build everything
@@ -72,20 +65,12 @@ rm -rf $RPM_BUILD_ROOT
 {
    for pkg in imake makedepend gccmakedep lndir xorg-cf-files ; do
       pushd $pkg-*
-      case $pkg in
-#         xorg-cf-files)
-#            make install DESTDIR=$RPM_BUILD_ROOT libdir=%%{_datadir}
-#            ;;
-         *)
-            make install DESTDIR=$RPM_BUILD_ROOT
-            ;;
-      esac
+      make install DESTDIR=$RPM_BUILD_ROOT
       popd
    done
 }
 
 %files
-%defattr(-,root,root,-)
 %doc
 %{_bindir}/ccmakedep
 %{_bindir}/cleanlinks
@@ -119,6 +104,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xmkmf.1*
 
 %changelog
+* Thu Jul 05 2018 Adam Jackson <ajax@redhat.com> - 1.0.7-11
+- xorg-cf-files 1.0.6
+- Drop pointless %%defattr
+- HTTPS URLs
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index 4f46b29..79d1df1 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-700c6d040d36a569e657a3ba5e1d8b24  xorg-cf-files-1.0.4.tar.bz2
-a47bcd6cecda1a6ebd3395926ea4f53a  lndir-1.0.3.tar.bz2
-7acb9a831817fdd11ba7f7aaa3c74fd8  makedepend-1.0.4.tar.bz2
-4042a4139a4636f78e2b8a144fdd1fcd  imake-1.0.7.tar.bz2
-683847bee13c78a005705824a7c6f225  gccmakedep-1.0.3.tar.bz2
+SHA512 (gccmakedep-1.0.3.tar.bz2) = 563b2897770a4df2792ea3eae8183a1f9e78192b7efc9c8296ee68d1cba6e72fa962a88e3251bb780df776e2aa7e80d74d5096675c61526c232aefa4f9e6a5fc
+SHA512 (imake-1.0.7.tar.bz2) = b3527c8fead25c6e093e1fe4a39e60ff210212dcd323e206505b9e872a3f36d9db85f85cab5a6f0fa914fa5c558ef54b499b2b13ccd66739223e4e72ef805d08
+SHA512 (lndir-1.0.3.tar.bz2) = c9f03c825c627935abe399bf8292bbf69304cb9e9d65a4c860b49e32e2ed4dde25bf658a5ab2116cd215381d0a52f464a8a53469c27adddbd9fa2bfd135a7289
+SHA512 (makedepend-1.0.4.tar.bz2) = b4e276847deed9f52b86d89e4b14b5521aabc409fabb840aaaec6097fae2284be3c0f723b60e77267b6bea37c24ea8ad84afb81c4104e5f22049810e9ad6802e
+SHA512 (xorg-cf-files-1.0.6.tar.bz2) = 1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa