diff -Nru urlwatch-2.8/debian/changelog urlwatch-2.8/debian/changelog
--- urlwatch-2.8/debian/changelog	2018-02-25 13:23:09.000000000 +0000
+++ urlwatch-2.8/debian/changelog	2018-03-01 23:24:12.000000000 +0000
@@ -1,3 +1,11 @@
+urlwatch (2.8-2) unstable; urgency=medium
+
+  * Changed dependency on keyring to recommends (Closes: #891456)
+  * Fixed autopkgtests
+  * Fixed typo in patch headers
+
+ -- Maxime Werlen <maxime@werlen.fr>  Fri, 02 Mar 2018 00:24:12 +0100
+
 urlwatch (2.8-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru urlwatch-2.8/debian/control urlwatch-2.8/debian/control
--- urlwatch-2.8/debian/control	2018-02-24 12:44:44.000000000 +0000
+++ urlwatch-2.8/debian/control	2018-02-28 21:24:39.000000000 +0000
@@ -27,11 +27,7 @@
  ${misc:Depends},
  ${python3:Depends},
 Recommends:
- lynx,
- python-utidylib,
- python-vobject,
-Suggests:
- html2text,
+ ${python3:Recommends},
 Description: tool for monitoring webpages for updates
  urlwatch is intended to help you watch changes in webpages and get notified
  (via email, in your terminal or with a custom-written reporter class) of any
diff -Nru urlwatch-2.8/debian/patches/removeNonessentialRequirements.diff urlwatch-2.8/debian/patches/removeNonessentialRequirements.diff
--- urlwatch-2.8/debian/patches/removeNonessentialRequirements.diff	1970-01-01 00:00:00.000000000 +0000
+++ urlwatch-2.8/debian/patches/removeNonessentialRequirements.diff	2018-02-28 22:03:37.000000000 +0000
@@ -0,0 +1,21 @@
+Description: Removes non-essentials dependencies from setup.py
+ This patch removes non-essentials dependencies from setup.py to avoid depending on
+ python3-keyring and transitively on dbus. Python3 keyring is added as a recommended
+ dependency by a dh_python3 option.
+Author: Maxime Werlen <maxime@werlen.fr>
+Forwarded: no
+Last-Update: 28/02/2018
+---
+This patch header follows DEP-3: https://dep.debian.net/deps/dep3/
+--- a/setup.py
++++ b/setup.py
+@@ -13,7 +13,8 @@
+ m['author'], m['author_email'] = re.match(r'(.*) <(.*)>', m['author']).groups()
+ m['description'], m['long_description'] = docs[0].strip().split('\n\n', 1)
+ m['download_url'] = '{url}urlwatch-{version}.tar.gz'.format(**m)
+-m['install_requires'] = ['minidb', 'PyYAML', 'requests', 'keyring', 'pycodestyle', 'appdirs']
++m['install_requires'] = ['minidb', 'PyYAML', 'requests', 'appdirs']
++m['extras_require'] = {'mail': ['keyring']}
+ m['scripts'] = ['urlwatch']
+ m['package_dir'] = {'': 'lib'}
+ m['packages'] = ['urlwatch']
diff -Nru urlwatch-2.8/debian/patches/series urlwatch-2.8/debian/patches/series
--- urlwatch-2.8/debian/patches/series	2018-02-24 19:24:06.000000000 +0000
+++ urlwatch-2.8/debian/patches/series	2018-02-28 21:43:21.000000000 +0000
@@ -1,3 +1,4 @@
 RemoveDependenciesFromReadme.diff
 fixSetuptoolsWarning.diff
 useEditorBinaryIfPresent.diff
+removeNonessentialRequirements.diff
diff -Nru urlwatch-2.8/debian/patches/useEditorBinaryIfPresent.diff urlwatch-2.8/debian/patches/useEditorBinaryIfPresent.diff
--- urlwatch-2.8/debian/patches/useEditorBinaryIfPresent.diff	2018-02-25 13:12:35.000000000 +0000
+++ urlwatch-2.8/debian/patches/useEditorBinaryIfPresent.diff	2018-02-28 21:58:47.000000000 +0000
@@ -1,7 +1,7 @@
 Description: Adds fallback on editor when $VISUAL and $EDITOR are absent
- urlwatch allow to edit config files with an urlwatch command. This command call an
+ urlwatch allow one to edit config files with an urlwatch command. This command call an
  editor for this purpose. Editor is chosen by reading $VISUAL and $EDITOR. If both are
- absent then urlwatch now attemps to call editor
+ absent then urlwatch now attempts to call editor
 Author: Maxime Werlen <maxime@werlen.fr>
 Bug: https://github.com/thp/urlwatch/pull/208
 Last-Update: 2018-02-24
diff -Nru urlwatch-2.8/debian/rules urlwatch-2.8/debian/rules
--- urlwatch-2.8/debian/rules	2018-02-09 05:21:33.000000000 +0000
+++ urlwatch-2.8/debian/rules	2018-02-28 21:54:49.000000000 +0000
@@ -4,4 +4,7 @@
 export PYBUILD_NAME = urlwatch
 
 %:
-	dh $@ --with python3 --buildsystem=pybuild
+	dh $@ --with python3 --buildsystem=pybuild 
+    
+override_dh_python3:
+	dh_python3 --recommends=keyring
diff -Nru urlwatch-2.8/debian/tests/control urlwatch-2.8/debian/tests/control
--- urlwatch-2.8/debian/tests/control	2018-02-24 20:55:27.000000000 +0000
+++ urlwatch-2.8/debian/tests/control	2018-03-01 23:01:28.000000000 +0000
@@ -1,2 +1,2 @@
 Tests: nominalCase.sh, migration.sh, editor.sh
-Depends: shunit2
+Depends: shunit2, @
diff -Nru urlwatch-2.8/debian/tests/editor.sh urlwatch-2.8/debian/tests/editor.sh
--- urlwatch-2.8/debian/tests/editor.sh	2018-02-24 22:08:52.000000000 +0000
+++ urlwatch-2.8/debian/tests/editor.sh	2018-03-01 23:08:58.000000000 +0000
@@ -7,9 +7,10 @@
     export HOME=$AUTOPKGTEST_TMP
     unset VISUAL
     unset EDITOR
-    echo -e "#! /bin/bash\necho \"Running editor on \$1\"\necho '#' >> \$1" > $AUTOPKGTEST_TMP/../deps/usr/bin/editor
-    chmod a+x $AUTOPKGTEST_TMP/../deps/usr/bin/editor
-    /usr/bin/urlwatch --edit
+    echo -e "#! /bin/bash\necho \"Running editor on \$1\"\necho '#' >> \$1" > $AUTOPKGTEST_TMP/editor
+    chmod a+x $AUTOPKGTEST_TMP/editor
+    export PATH=$AUTOPKGTEST_TMP:$PATH
+    urlwatch --edit
     result=$?
     assertEquals "Urlwatch should use editor and not return 1" 0 $result
     lastChar=`tail -c 2 $AUTOPKGTEST_TMP/.urlwatch/urls.yaml`
diff -Nru urlwatch-2.8/debian/tests/migration.sh urlwatch-2.8/debian/tests/migration.sh
--- urlwatch-2.8/debian/tests/migration.sh	2018-02-24 19:47:23.000000000 +0000
+++ urlwatch-2.8/debian/tests/migration.sh	2018-03-01 21:23:49.000000000 +0000
@@ -6,7 +6,7 @@
     echo -e "|ls -al $AUTOPKGTEST_TMP" > $AUTOPKGTEST_TMP/.urlwatch/urls.txt
     echo -e "from urlwatch import html2txt\ndef filter(url, data):\n        if url.startswith(\"http://urlwatch.com/\"):\n                return html2txt.html2text(data, method='html2text')" > $AUTOPKGTEST_TMP/.urlwatch/lib/hooks.py
     export HOME=$AUTOPKGTEST_TMP
-    /usr/bin/urlwatch
+    urlwatch
     result=$?
     assertEquals "Urlwatch should return an exit code 0" 0 $result
     [ -f $AUTOPKGTEST_TMP/.urlwatch/urls.yaml ] || fail "File urls.yaml should have been written"
diff -Nru urlwatch-2.8/debian/tests/nominalCase.sh urlwatch-2.8/debian/tests/nominalCase.sh
--- urlwatch-2.8/debian/tests/nominalCase.sh	2018-02-24 22:15:29.000000000 +0000
+++ urlwatch-2.8/debian/tests/nominalCase.sh	2018-03-01 21:23:58.000000000 +0000
@@ -3,7 +3,7 @@
 
 testWarnOnEmptyConfig() {
     export HOME=$AUTOPKGTEST_TMP
-    /usr/bin/urlwatch
+    urlwatch
     result=$?
     assertEquals "On first launch urlwatch should return an exit code 1 due to lack of config file" 1 $result
 }
@@ -11,7 +11,7 @@
 testWithUrlfile(){
     export HOME=$AUTOPKGTEST_TMP
     echo -e "---\nname: \"tmp listing\"\ncommand: \"ls -al $AUTOPKGTEST_TMP\"" > $AUTOPKGTEST_TMP/urls.json
-    /usr/bin/urlwatch --urls $AUTOPKGTEST_TMP/urls.json
+    urlwatch --urls $AUTOPKGTEST_TMP/urls.json
     result=$?
     assertEquals "Urlwatch should return an exit code 0" 0 $result
 }