diff --git a/python-pyftpdlib.changes b/python-pyftpdlib.changes
index fe5b8d6..98fa86d 100644
--- a/python-pyftpdlib.changes
+++ b/python-pyftpdlib.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri May  7 23:13:10 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- Skip masquerade tests failung because the newest Pythons don't
+  allow invalid addresses gh#giampaolo/pyftpdlib#550, bpo-43285
+- Remove script interpreter lines for test files and _compyt.py
+  (fix rpmlint warnings)
+
 -------------------------------------------------------------------
 Fri Dec 18 16:29:52 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
 
diff --git a/python-pyftpdlib.spec b/python-pyftpdlib.spec
index db13814..9220867 100644
--- a/python-pyftpdlib.spec
+++ b/python-pyftpdlib.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-pyftpdlib
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 # Copyright (c) 2016 LISA GmbH, Bingen, Germany.
 #
 # All modifications and additions to the file contributed by third parties
@@ -36,7 +36,7 @@ BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-pyOpenSSL
 Requires(post): update-alternatives
-Requires(postun): update-alternatives
+Requires(postun):update-alternatives
 Recommends:     python-pysendfile
 BuildArch:      noarch
 %if %{with python2}
@@ -54,6 +54,7 @@ write very asynchronous FTP servers with Python.
 
 %prep
 %setup -q -n pyftpdlib-%{version}
+sed -i '1 {/env python/ d}' pyftpdlib/test/*.py pyftpdlib/_compat.py
 
 %build
 %python_build
@@ -71,6 +72,8 @@ write very asynchronous FTP servers with Python.
 # and disable only related tests.
 donttest="(TestFtpStoreDataTLSMixin and test_rest_on_stor)"
 donttest+=" or (TestFtpStoreDataTLSMixin and test_stor_ascii)"
+# https://github.com/giampaolo/pyftpdlib/issues/550
+donttest+=" or test_masquerade_address"
 ignorebuild="--ignore build"
 %{python_expand # expand to python flavor, not to the binary name, then strip the trailing _
 builddir=_build.$python_
@@ -78,8 +81,8 @@ ignorebuild+=" --ignore ${builddir%_}"
 }
 cat > pytest.ini <<EOF
 [pytest]
-addopts = 
-  -rs -v 
+addopts =
+  -rs -v
   -k "not ($donttest)"
   $ignorebuild
 EOF