diff --git a/python-rosdep.spec b/python-rosdep.spec
index e01e9a5..4d54663 100644
--- a/python-rosdep.spec
+++ b/python-rosdep.spec
@@ -5,7 +5,7 @@
 
 Name:           python-%{srcname}
 Version:        0.16.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        ROS System Dependency Installer
 
 License:        BSD
@@ -42,6 +42,7 @@ BuildRequires:  python2-nose
 BuildRequires:  python2-pyyaml >= 3.1
 BuildRequires:  python2-rosdistro >= 0.7.0
 BuildRequires:  python2-rospkg >= 1.1.8
+Requires:       python-srpm-macros
 %{?python_provide:%python_provide python2-%{srcname}}
 
 %if %{undefined __pythondist_requires}
@@ -51,10 +52,10 @@ Requires:       python2-rosdistro >= 0.7.0
 Requires:       python2-rospkg >= 1.1.8
 %endif # __pythondist_requires
 
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
 Recommends:     python2-rpm
-Recommends:     %{name}-doc = %{version}-%{release}
-%endif # fedora
+Suggests:       %{name}-doc = %{version}-%{release}
+%endif # fedora || rhel >= 8
 
 %description -n python2-%{srcname}
 rosdep is a command-line tool for installing system dependencies. For
@@ -76,6 +77,7 @@ BuildRequires:  python%{python3_pkgversion}-nose
 BuildRequires:  python%{python3_pkgversion}-PyYAML >= 3.1
 BuildRequires:  python%{python3_pkgversion}-rosdistro >= 0.7.0
 BuildRequires:  python%{python3_pkgversion}-rospkg >= 1.1.8
+Requires:       python-srpm-macros
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
 
 %if %{undefined __pythondist_requires}
@@ -85,10 +87,10 @@ Requires:       python%{python3_pkgversion}-rosdistro >= 0.7.0
 Requires:       python%{python3_pkgversion}-rospkg >= 1.1.8
 %endif # __pythondist_requires
 
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
 Recommends:     python%{python3_pkgversion}-rpm
-Recommends:     %{name}-doc = %{version}-%{release}
-%endif # fedora
+Suggests:       %{name}-doc = %{version}-%{release}
+%endif # fedora || rhel >= 8
 
 %description -n python%{python3_pkgversion}-%{srcname}
 rosdep is a command-line tool for installing system dependencies. For
@@ -191,6 +193,11 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m nose test.test_rosdep_
 
 
 %changelog
+* Fri Oct 04 2019 Scott K Logan <logans@cottsay.net> - 0.16.1-2
+- Add dependency on python-srpm-macros to resolve %%{python3_pkgversion}
+- Add weak dependencies for RHEL 8
+- Make doc subpackage dependency weaker
+
 * Thu Sep 19 2019 Scott K Logan <logans@cottsay.net> - 0.16.1-1
 - Update to 0.16.1
 - Drop Python 2 subpackage from f32+ (rhbz#1740997)