--- a/rss2email/feed.py
+++ b/rss2email/feed.py
@@ -433,7 +433,7 @@ def _check_for_errors(self, parsed):
         elif isinstance(exc, _SOCKET_ERRORS):
             _LOG.error('{}: {}'.format(exc, self))
             warned = True
-        elif isinstance(exc, _feedparser.zlib.error):
+        elif isinstance(exc, _feedparser.http.zlib.error):
             _LOG.error('broken compression: {}'.format(self))
             warned = True
         elif isinstance(exc, (IOError, AttributeError)):


--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
-feedparser==5.2.1
+feedparser>=6.0.0
 html2text==2020.1.16

--- a/setup.py
+++ b/setup.py
@@ -65,7 +65,7 @@
     scripts=['r2e'],
     provides=['rss2email'],
     install_requires=[
-        'feedparser>=5.0.1',
+        'feedparser>=6.0.0',
         'html2text>=3.0.1',
         ],
     )


--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: [3.5, 3.6, 3.7, 3.8]
+        python-version: [3.6, 3.7, 3.8]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}


--- a/HACKING.md
+++ b/HACKING.md
@@ -43,9 +43,9 @@ against multiple python versions.
 You can build each one of them like this:
 
 ```
-nix-build -A pythonVersions.rss2email-python_3_5 nix/release.nix
 nix-build -A pythonVersions.rss2email-python_3_6 nix/release.nix
 nix-build -A pythonVersions.rss2email-python_3_7 nix/release.nix
+nix-build -A pythonVersions.rss2email-python_3_8 nix/release.nix
 …
 ```
 

--- a/nix/release.nix
+++ b/nix/release.nix
@@ -3,7 +3,6 @@ let
   pkgs = import nixpkgs {};
 
   supportedPackageSets = [
-    { version = "3_5"; set = pkgs.python35Packages; }
     { version = "3_6"; set = pkgs.python36Packages; }
     { version = "3_7"; set = pkgs.python37Packages; }
     { version = "3_8"; set = pkgs.python38Packages; }
@@ -31,7 +30,7 @@ let
     '';
   };
 
-  # { "rss2email-python_3_5" = <rss2email package>; … }
+  # { "rss2email-python_3_6" = <rss2email package>; … }
   rss2emailVersions =
     (pkgs.lib.listToAttrs
       (map


--- a/rss2email/email.py
+++ b/rss2email/email.py
@@ -325,7 +325,7 @@ def _flatten(message):
     """
     bytesio = _io.BytesIO()
     # TODO: use policies argument instead of policy set in `message`
-    # see https://docs.python.org/3.5/library/email.generator.html?highlight=bytesgenerator#email.generator.BytesGenerator
+    # see https://docs.python.org/3.6/library/email.generator.html?highlight=bytesgenerator#email.generator.BytesGenerator
     generator = _BytesGenerator(bytesio)
     try:
         generator.flatten(message)


--- a/setup.py
+++ b/setup.py
@@ -54,7 +54,6 @@
         'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',


--- a/test/data/disqus/1.expected
+++ b/test/data/disqus/1.expected
@@ -43,7 +43,7 @@
 List-ID: <test.localhost>
 List-Post: NO (posting not allowed on this list)
 X-RSS-Feed: data/disqus/feed.rss
-X-RSS-ID: ab03f2100069a1cd0876b997be87976c18d48e8a
+X-RSS-ID: a52375ec78a988241fe9864a2243d4d910538d52
 X-RSS-URL: http://software-carpentry.org/2012/11/who-wants-to-write-a-little-code/#comment-713578640
 
 @Hans-Martin