diff --git a/python-networkx.changes b/python-networkx.changes
index 262d8f0..23cd259 100644
--- a/python-networkx.changes
+++ b/python-networkx.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb  1 14:05:38 UTC 2021 - Benjamin Greiner <code@bnavigator.de>
+
+- Disable python36 build for good. Next up is SciPy 1.6.0 dropping
+  Python 3.6 because of NEP 29.
+- Mark the doc package files as doc.
+
 -------------------------------------------------------------------
 Sat Jan 30 01:42:49 UTC 2021 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-networkx.spec b/python-networkx.spec
index dd8e157..ddfd1de 100644
--- a/python-networkx.spec
+++ b/python-networkx.spec
@@ -18,8 +18,7 @@
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define         skip_python2 1
-# Temporarily reenabled until SciPy is updated, because the PyYAML fix needs to be merged first
-#%%define         skip_python36 1
+%define         skip_python36 1
 Name:           python-networkx
 Version:        2.5
 Release:        0
@@ -115,6 +114,6 @@ popd
 
 %files -n %{name}-doc
 %license LICENSE.txt
-%{_docdir}/networkx-%{version}/
+%doc %{_docdir}/networkx-%{version}/
 
 %changelog