diff --git a/.gitignore b/.gitignore
index 583a548..04f93f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ koji-1.4.0.tar.bz2
 /koji-1.16.0.tar.bz2
 /koji-1.16.1.tar.bz2
 /koji-1.16.2.tar.bz2
+/koji-1.17.0.tar.bz2
diff --git a/fedora-config.patch b/fedora-config.patch
index c141278..21a3398 100644
--- a/fedora-config.patch
+++ b/fedora-config.patch
@@ -1,6 +1,17 @@
-diff -rup koji-1.15.0.orig/cli/koji.conf koji-1.15.0/cli/koji.conf
---- koji-1.15.0.orig/cli/koji.conf	2018-01-27 10:44:39.111029362 +0100
-+++ koji-1.15.0/cli/koji.conf	2018-01-27 10:46:33.713817186 +0100
+From 47d9f103194e65611a472db42eff03eabe423739 Mon Sep 17 00:00:00 2001
+From: Patrick Uiterwijk <patrick@puiterwijk.org>
+Date: Thu, 7 Mar 2019 12:22:12 +0100
+Subject: [PATCH] Apply Fedora instance configuration
+
+Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
+---
+ cli/koji.conf | 24 +++++++++++-------------
+ 1 file changed, 11 insertions(+), 13 deletions(-)
+
+diff --git a/cli/koji.conf b/cli/koji.conf
+index addd4e3..4fcb2ae 100644
+--- a/cli/koji.conf
++++ b/cli/koji.conf
 @@ -3,18 +3,23 @@
  ;configuration for koji cli tool
  
@@ -28,7 +39,7 @@ diff -rup koji-1.15.0.orig/cli/koji.conf koji-1.15.0/cli/koji.conf
  
  ;the service name of the principal being used by the hub
  ;krbservice = host
-@@ -29,13 +34,6 @@
+@@ -29,16 +34,9 @@
  ;krb_canon_host = no
  
  
@@ -45,3 +56,9 @@ diff -rup koji-1.15.0.orig/cli/koji.conf koji-1.15.0/cli/koji.conf
 +;enabled plugins for CLI, runroot is enabled by deafult for fedora
 +;save_failed_tree is available
 +plugins = runroot
+ 
+ ;timeout of XMLRPC requests by seconds, default: 60 * 60 * 12 = 43200
+ ;timeout = 43200
+-- 
+2.20.1
+
diff --git a/koji.spec b/koji.spec
index 91f37de..496fdb3 100644
--- a/koji.spec
+++ b/koji.spec
@@ -29,7 +29,7 @@
 %endif
 
 Name: koji
-Version: 1.16.2
+Version: 1.17.0
 Release: 1%{?dist}
 # koji.ssl libs (from plague) are GPLv2+
 License: LGPLv2 and GPLv2+
@@ -37,12 +37,6 @@ Summary: Build system tools
 URL: https://pagure.io/koji/
 Source0: https://releases.pagure.org/koji/koji-%{version}.tar.bz2
 
-# Fix is_conn_error bug which commonly caused operations that wait a
-# long time to fail out prematurely on Python 3
-# https://pagure.io/koji/issue/1192
-# https://pagure.io/koji/pull-request/1203
-Patch0: 0001-Fix-is_conn_error-for-Python-3.3-change-to-socket.er.patch
-
 # Not upstreamable
 Patch100: fedora-config.patch
 
@@ -239,7 +233,6 @@ koji-web is a web UI to the Koji system.
 
 %prep
 %setup -q
-%patch0 -p1 -b .connerror
 %patch100 -p1 -b .fedoraconfig
 
 %build
@@ -257,6 +250,10 @@ make DESTDIR=$RPM_BUILD_ROOT PYTHON=python3 %{?install_opt} install
 # alter python interpreter in koji CLI
 sed -i 's/\#\!\/usr\/bin\/python2/\#\!\/usr\/bin\/python3/' $RPM_BUILD_ROOT/usr/bin/koji
 %endif
+%if 0%{?fedora} <= 29
+# This changed in 1.17.0, make sure that existing installs do not break
+ln -s /usr/share/koji-hub %RPM_BUILD_ROOT/usr/libexec/koji-hub
+%endif
 
 %files
 %{_bindir}/*
@@ -290,7 +287,11 @@ sed -i 's/\#\!\/usr\/bin\/python2/\#\!\/usr\/bin\/python3/' $RPM_BUILD_ROOT/usr/
 
 %files hub
 %{_datadir}/koji-hub
-%dir %{_libexecdir}/koji-hub
+%if 0%{?fedora} <= 29
+# Compatibility symlink
+%{_libexecdir}/koji-hub
+%endif
+%dir %{_datarootdir}/koji-hub
 %config(noreplace) /etc/httpd/conf.d/kojihub.conf
 %dir /etc/koji-hub
 %config(noreplace) /etc/koji-hub/hub.conf
@@ -299,6 +300,7 @@ sed -i 's/\#\!\/usr\/bin\/python2/\#\!\/usr\/bin\/python3/' $RPM_BUILD_ROOT/usr/
 %files hub-plugins
 %dir %{_prefix}/lib/koji-hub-plugins
 %{_prefix}/lib/koji-hub-plugins/*.py*
+%{_prefix}/lib/koji-hub-plugins/__pycache__/
 %dir /etc/koji-hub/plugins
 /etc/koji-hub/plugins/*.conf
 
@@ -333,6 +335,7 @@ sed -i 's/\#\!\/usr\/bin\/python2/\#\!\/usr\/bin\/python3/' $RPM_BUILD_ROOT/usr/
 %defattr(-,root,root)
 %dir %{_prefix}/lib/koji-builder-plugins
 %{_prefix}/lib/koji-builder-plugins/*.py*
+%{_prefix}/lib/koji-builder-plugins/__pycache__/
 %if %{use_systemd}
 %{_unitdir}/kojid.service
 %else
@@ -431,6 +434,9 @@ fi
 %endif
 
 %changelog
+* Thu Mar 07 2019 Patrick Uiterwijk <puiterwijk@redhat.com> - 1.17.0-1
+- Rebase to 1.17.0
+
 * Thu Feb 21 2019 Patrick Uiterwijk <puiterwijk@redhat.com> - 1.16.2-1
 - Rebase to 1.16.2 for CVE-2018-1002161
 
diff --git a/sources b/sources
index a1c170f..12d49b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (koji-1.16.2.tar.bz2) = 197cf4e9163393b33b954d466a14ba7ea2107754c824f4c40d833603492870f079264093b6b966c111feb0d139ca9378e90e279bca41614e07ab184747f95205
+SHA512 (koji-1.17.0.tar.bz2) = 6f5da6d10ca3d2c01aa9251d5fa01221a89eb80a24b6b933197f359d9bc348d8e2f8b18d66d886454bdf89e8269a6a9652c44f1858b1c75d6540e32898e76f89