diff --git a/python2-django1.11.spec b/python2-django1.11.spec
index 5b2d342..a7af165 100644
--- a/python2-django1.11.spec
+++ b/python2-django1.11.spec
@@ -1,10 +1,18 @@
 %global         pkgname Django
 
 
+%if 0%{fedora} >= 31
+# python2-sphinx is no more
+%bcond_with doc
+%else
+%bcond_without doc
+%endif
+
+
 Name:           python2-django1.11
 
-Version:        1.11.20
-Release:        1%{?dist}
+Version:        1.11.21
+Release:        2%{?dist}
 Summary:        Version 1.11 LTS of Django, a high-level Python Web framework
 
 License:        BSD
@@ -49,6 +57,7 @@ much as possible and adhering to the DRY (Don't Repeat Yourself)
 principle.
 
 
+%if %{with doc}
 %package doc
 Summary:        Documentation for Django, version 1.11 LTS
 Requires:       %{name} = %{version}-%{release}
@@ -63,6 +72,7 @@ Obsoletes:      python2-django-doc < 2
 %description doc
 This package contains the documentation for the Django high-level
 Python Web framework, version 1.11 LTS.
+%endif #{with doc}
 
 
 # Exclude templates from shebang mangling
@@ -70,7 +80,7 @@ Python Web framework, version 1.11 LTS.
 
 
 %prep
-%autosetup -n %{pkgname}-%{version}
+%autosetup -n %{pkgname}-%{version} -p1
 
 # Remove stray executable bit
 chmod -v -x django/contrib/admin/static/admin/js/vendor/xregexp/xregexp.js
@@ -91,8 +101,9 @@ pathfix.py -pni "%{_bindir}/env python2" $(find -name '*.py-tpl')
 # append djangojs.lang to django.lang
 cat djangojs.lang >> django.lang
 
-# build documentation
+%if %{with doc}
 (cd docs && mkdir djangohtml && mkdir -p _build/{doctrees,html} && make html)
+%endif #{with doc}
 
 # Fix admin script in %%{_bindir}
 mv %{buildroot}%{_bindir}/django-admin %{buildroot}%{_bindir}/django-admin-1.11
@@ -131,11 +142,18 @@ cd tests
 %{python2_sitelib}/*.egg-info
 
 
+%if %{with doc}
 %files doc
 %doc docs/_build/html/*
+%endif #{with doc}
 
 
 %changelog
+* Wed Jun 19 2019 Petr Viktorin <pviktori@redhat.com> - 1.11.21-1
+- Update to the 1.11.21 security fix release
+- CVE-2019-12308: AdminURLFieldWidget XSS
+- Stop building the doc subpackage
+
 * Mon Feb 18 2019 Petr Viktorin <pviktori@redhat.com> - 1.11.20-1
 - Update to the 1.11.20 security fix release
 - CVE-2019-6975: Memory exhaustion in django.utils.numberformat.format()
diff --git a/sources b/sources
index 3aad55e..f9ab0e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Django-1.11.20.tar.gz) = 5a0fff6c9b90a08e98dee6d4d090047adb900a8f6a061f98e685e8998bfe3d97fe7a90aa7d4d2feae67026fb6e4441393d50cb5ab295604ed362a080b987f062
+SHA512 (Django-1.11.21.tar.gz) = c91a1189b6b8fbbb1470f870b09c1c553e860d3b8c0977240399524a830d5403929f14b4e4b689354080748aab1c70587ad56e265f4ac0b3bdc2714d01adbbc4