diff --git a/cobbler.spec b/cobbler.spec
index df1242e..ef2c04e 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -7,18 +7,18 @@
 
 Name:           cobbler
 Version:        2.8.5
-Release:        0.1%{?dist}
+Release:        1%{?dist}
 Summary:        Boot server configurator
 URL:            http://cobbler.github.io/
 License:        GPLv2+
-Source0:        https://github.com/cobbler/cobbler/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:        https://github.com/cobbler/cobbler/archive/v%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires: git
 BuildRequires: /usr/bin/pathfix.py
 BuildRequires: python2-devel
 BuildRequires: python2-pyyaml
 BuildRequires: python2-setuptools
-%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
+%if 0%{?fedora} || 0%{?rhel} > 7
 BuildRequires: python2-cheetah
 %else
 BuildRequires: python-cheetah
@@ -30,7 +30,7 @@ Requires: createrepo
 Requires: rsync
 Requires: python2-simplejson
 Requires: python2-pyyaml
-%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
+%if 0%{?fedora} || 0%{?rhel} > 7
 Requires: python2-mod_wsgi
 Requires: python2-cheetah
 Requires: python2-netaddr
@@ -52,6 +52,8 @@ Requires: dnf-plugins-core
 %else
 Requires: yum-utils
 %endif
+# https://github.com/cobbler/cobbler/issues/1685
+Requires: /sbin/service
 %if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires: systemd
 Requires(post): systemd
@@ -78,13 +80,15 @@ other applications.
 Summary:        Web interface for Cobbler
 BuildArch:      noarch
 Requires:       cobbler
-%if 0%{?fedora} >= 28
+%if 0%{?fedora}
 Requires:       python2-django1.11
+Requires:       python2-ipaddress
 %endif
 %if 0%{?el7}
 Requires:       python2-django
+Requires:       python-ipaddress
 %endif
-%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
+%if 0%{?fedora} || 0%{?rhel} > 7
 Requires:       python2-mod_wsgi
 %else
 Requires:       Django > 1.6
@@ -102,13 +106,14 @@ http://server/cobbler_web to configure the install server.
 Summary:        Helper tool that performs cobbler orders on remote machines
 BuildArch:      noarch
 Requires:       python2-simplejson
-%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
+%if 0%{?fedora} || 0%{?rhel} > 7
 Requires:       python2-ethtool
 Requires:       python2-urlgrabber
 %else
 Requires:       python-ethtool
 Requires:       python-urlgrabber
 %endif
+Requires:       /sbin/service
 Requires:       virt-install
 
 %description -n koan
@@ -264,6 +269,15 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" /usr/share/cobbler/
 
 
 %changelog
+* Sun Dec 29 2019 Orion Poplawski <orion@nwra.com> - 2.8.5-1
+- Udate to 2.8.5 final release
+
+* Mon Oct 14 2019 Orion Poplawski <orion@nwra.com> - 2.8.5-0.3
+- Require python2-ipaddress
+
+* Thu Oct 10 2019 Orion Poplawski <orion@nwra.com> - 2.8.5-0.2
+- Require /sbin/service
+
 * Mon Aug 26 2019 Nicolas Chauvet <kwizart@gmail.com> - 2.8.5-0.1
 - Update to 2.8.5 - pre-release
 
diff --git a/sources b/sources
index 5301563..d7a28a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cobbler-2.8.5.tar.gz) = 6097618b6ad394f23f496eee14a74a334162b2d420c39059bf54472a44b4a6a645faf9ee50139f7c169503d34524489282b03a2f7318ca8b276745cc518567a7
+SHA512 (cobbler-2.8.5.tar.gz) = 6587308eb9eb49f7a894ddd052e1e3e226b4bcbffcf5c7e909e035b3faba1a8ae00631b96e11f0274d058b41b985b9a53776428b4587708111ef8158dec4e9d1