diff -Nru archmage-0.3.1/debian/changelog archmage-0.3.1/debian/changelog
--- archmage-0.3.1/debian/changelog	2015-05-19 20:29:47.000000000 +0000
+++ archmage-0.3.1/debian/changelog	2018-03-11 18:57:27.000000000 +0000
@@ -1,3 +1,16 @@
+archmage (1:0.3.1-4) unstable; urgency=medium
+
+  [Mikhail Gusarov]
+  * Use beautifulsoup4 instead of ancient BeautifulSoup 3
+    (Closes: #891090).
+  * Bump Standards-Version, no changes required.
+
+  [Ondřej Nový]
+  * d/watch: Use https protocol
+  * d/changelog: Remove trailing whitespaces
+
+ -- Mikhail Gusarov <dottedmag@debian.org>  Sun, 11 Mar 2018 19:57:27 +0100
+
 archmage (1:0.3.1-3) unstable; urgency=low
 
   * Do not fail upgrade if /etc/archmage is not present
@@ -88,7 +101,7 @@
  -- Mikhail Gusarov <dottedmag@dottedmag.net>  Thu, 02 Apr 2009 15:55:49 +0700
 
 archmage (1:0.1.9-3) unstable; urgency=low
-  
+
   [ Mikhail Gusarov ]
   * Added description to patches (lintian warning):
     - debian/patches/python-interpreter.diff
diff -Nru archmage-0.3.1/debian/control archmage-0.3.1/debian/control
--- archmage-0.3.1/debian/control	2015-03-06 11:29:20.000000000 +0000
+++ archmage-0.3.1/debian/control	2018-03-11 18:57:27.000000000 +0000
@@ -4,14 +4,14 @@
 Maintainer: Mikhail Gusarov <dottedmag@debian.org>
 Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
 Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools, dh-python
-Standards-Version: 3.9.6
-Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/archmage/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/archmage/trunk/
+Standards-Version: 4.1.3
+Vcs-Git: https://salsa.debian.org/python-team/applications/archmage.git
+Vcs-Browser: https://salsa.debian.org/python-team/applications/archmage
 Homepage: http://archmage.sf.net
 
 Package: archmage
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-chm, python-beautifulsoup, python-setuptools
+Depends: ${python:Depends}, ${misc:Depends}, python-chm, python-bs4, python-lxml, python-setuptools
 Suggests: libapache2-mod-python, elinks | links, htmldoc
 Description: CHM(Compiled HTML) Decompressor
  arCHMage is a reader and decompiler for files in the CHM format. This is the
diff -Nru archmage-0.3.1/debian/gbp.conf archmage-0.3.1/debian/gbp.conf
--- archmage-0.3.1/debian/gbp.conf	1970-01-01 00:00:00.000000000 +0000
+++ archmage-0.3.1/debian/gbp.conf	2018-03-03 20:46:38.000000000 +0000
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch=debian/master
diff -Nru archmage-0.3.1/debian/patches/bs4-transition.patch archmage-0.3.1/debian/patches/bs4-transition.patch
--- archmage-0.3.1/debian/patches/bs4-transition.patch	1970-01-01 00:00:00.000000000 +0000
+++ archmage-0.3.1/debian/patches/bs4-transition.patch	2018-03-11 18:44:59.000000000 +0000
@@ -0,0 +1,46 @@
+Description: Use bs4 in place of BeautifulSoup version 3
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: debian
+Bug-Debian: https://bugs.debian.org/891090
+Last-Update: 2018-03-11
+
+Index: archmage/archmod/CHMParser.py
+===================================================================
+--- archmage.orig/archmod/CHMParser.py
++++ archmage/archmod/CHMParser.py
+@@ -22,7 +22,7 @@ import re
+ import mimetypes
+ import sgmllib, urllib2
+ 
+-from BeautifulSoup import BeautifulSoup
++from bs4 import BeautifulSoup
+ from HTMLParser import HTMLParser, HTMLParseError
+ from urlparse import urlparse
+ 
+@@ -38,7 +38,7 @@ class SitemapFile(object):
+     def __init__(self, lines):
+         # XXX: Cooking tasty beautiful soup ;-)
+         if lines:
+-            soup = BeautifulSoup(lines)
++            soup = BeautifulSoup(lines, 'lxml')
+             lines = soup.prettify()
+             # XXX: Removing empty tags
+             lines = re.sub(re.compile(r'<ul>\s*</ul>', re.I | re.M), '', lines)
+Index: archmage/setup.py
+===================================================================
+--- archmage.orig/setup.py
++++ archmage/setup.py
+@@ -28,7 +28,7 @@ setup(
+     packages=find_packages(),
+     install_requires=[
+         'pychm',
+-        'BeautifulSoup',
++        'beautifulsoup4',
+     ],
+     entry_points={
+         'console_scripts': ['archmage = archmod.cli:main'],
diff -Nru archmage-0.3.1/debian/patches/series archmage-0.3.1/debian/patches/series
--- archmage-0.3.1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ archmage-0.3.1/debian/patches/series	2018-03-11 18:33:53.000000000 +0000
@@ -0,0 +1 @@
+bs4-transition.patch
diff -Nru archmage-0.3.1/debian/watch archmage-0.3.1/debian/watch
--- archmage-0.3.1/debian/watch	2015-02-28 06:10:49.000000000 +0000
+++ archmage-0.3.1/debian/watch	2018-03-03 20:46:38.000000000 +0000
@@ -1,3 +1,3 @@
 version=3
 opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
-http://pypi.debian.net/archmage/archmage-(.+)\.(?:tar\.gz)
+https://pypi.debian.net/archmage/archmage-(.+)\.(?:tar\.gz)