diff --git a/rpmlint-1.9-py36magic.patch b/rpmlint-1.9-py36magic.patch
new file mode 100644
index 0000000..bf23574
--- /dev/null
+++ b/rpmlint-1.9-py36magic.patch
@@ -0,0 +1,11 @@
+--- rpmlint-rpmlint-1.9/FilesCheck.py	2016-12-29 22:16:24.738320169 -0800
++++ rpmlint-rpmlint-1.9/FilesCheck.py.new	2016-12-29 22:16:51.109411602 -0800
+@@ -324,7 +324,7 @@
+     '3.3': 3230,
+     '3.4': 3310,
+     '3.5': 3350,
+-    '3.6': 3361,
++    '3.6': 3379,
+ }
+ 
+ 
diff --git a/rpmlint.spec b/rpmlint.spec
index edb750a..470ce95 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -34,6 +34,9 @@ Source5:        %{name}.config.el5
 # https://github.com/rpm-software-management/rpmlint/commit/15e4ae11e498530f975574567fca0e65a9a0acb7
 # https://github.com/rpm-software-management/rpmlint/commit/d08a7ce333355898dea05b1ed82c5884eccde5ff
 Patch0:         rpmlint-1.9-unicodefix.patch
+# Python 3.6rc1 (3.6.0) bytecode magic value
+# https://github.com/rpm-software-management/rpmlint/pull/86 (hand-rediffed)
+Patch1:         rpmlint-1.9-py36magic.patch
 BuildArch:      noarch
 %if %{with python3}
 BuildRequires:  python3-devel
@@ -85,6 +88,7 @@ and source packages as well as spec files can be checked.
 %prep
 %setup -q -n %{name}-%{name}-%{version}
 %patch0 -p1 -b .unicodefix
+%patch1 -p1 -b .py36magic
 sed -i -e /MenuCheck/d Config.py
 cp -p config config.example
 install -pm 644 %{SOURCE3} config
@@ -134,8 +138,8 @@ make check PYTHON=%{python} PYTEST=%{pytest} FLAKE8=%{flake8}
 %{_mandir}/man1/rpmlint.1*
 
 %changelog
-* Tue Dec 13 2016 Charalampos Stratakis <cstratak@redhat.com> - 1.9-5
-- Rebuild for Python 3.6
+* Thu Dec 29 2016 Adam Williamson <awilliam@redhat.com> - 1.9-5
+- Update Python 3.6 magic bytecode value (github PR #7)
 
 * Mon Oct 24 2016 Orion Poplawski <orion@cora.nwra.com> - 1.9-4
 - Use %%license