diff --git a/python-zope.i18nmessageid.changes b/python-zope.i18nmessageid.changes
index 07c7c7f..4b3fed2 100644
--- a/python-zope.i18nmessageid.changes
+++ b/python-zope.i18nmessageid.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov  8 07:10:23 UTC 2022 - Matej Cepl <mcepl@suse.com>
+
+- Clean up SPEC file, make rpmlint happy.
+- -doc subpackage should be noarch.
+
 -------------------------------------------------------------------
 Sun Nov  6 17:57:02 UTC 2022 - Hans-Peter Jansen <hpj@urpla.net>
 
diff --git a/python-zope.i18nmessageid.spec b/python-zope.i18nmessageid.spec
index fde4ead..472f547 100644
--- a/python-zope.i18nmessageid.spec
+++ b/python-zope.i18nmessageid.spec
@@ -17,7 +17,6 @@
 #
 
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %global flavor @BUILD_FLAVOR@%{nil}
 %if "%{flavor}" == "test"
 %define psuffix -test
@@ -54,6 +53,7 @@ In Zope3, i18nmessageid are special objects that has a structural i18nmessageid.
 %package     -n %{name}-doc
 Summary:        Zope Location
 Provides:       %{python_module zope.i18nmessageid-doc = %{version}}
+BuildArch:      noarch
 
 %description -n %{name}-doc
 This package contains documentation files for %{name}.
@@ -86,7 +86,10 @@ python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo build/sphinx/ht
 %files %{python_files}
 %license LICENSE.txt
 %doc CHANGES.rst COPYRIGHT.txt README.rst
-%{python_sitearch}/*
+%dir %{python_sitearch}/zope
+%{python_sitearch}/zope/i18nmessageid
+%{python_sitearch}/zope.i18nmessageid-%{version}*-info
+%{python_sitearch}/zope.i18nmessageid-%{version}*-nspkg.pth
 %endif
 
 %if !%{with test}