diff -Nru mwc-2.0.4/debian/changelog mwc-2.0.5/debian/changelog
--- mwc-2.0.4/debian/changelog	2018-10-01 21:45:29.000000000 +0000
+++ mwc-2.0.5/debian/changelog	2019-07-14 08:30:27.000000000 +0000
@@ -1,3 +1,16 @@
+mwc (2.0.5-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Migrate to debhelper 12:
+    - Change debian/compat to 12.
+    - Bump minimum debhelper version in debian/control to >= 12.
+  * Declare compliance with Debian Policy 4.4.0 (No changes needed).
+  * Move mwcfeedserver from /usr/sbin to /usr/bin.
+  * debian/copyright:
+    - Add year 2019 to debian/*
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 14 Jul 2019 10:30:27 +0200
+
 mwc (2.0.4-3) unstable; urgency=medium
 
   * Declare compliance with Debian Policy 4.2.1 (No changes needed).
diff -Nru mwc-2.0.4/debian/compat mwc-2.0.5/debian/compat
--- mwc-2.0.4/debian/compat	2018-10-01 21:24:36.000000000 +0000
+++ mwc-2.0.5/debian/compat	2019-07-14 08:16:45.000000000 +0000
@@ -1 +1 @@
-11
+12
diff -Nru mwc-2.0.4/debian/control mwc-2.0.5/debian/control
--- mwc-2.0.4/debian/control	2018-10-01 21:32:52.000000000 +0000
+++ mwc-2.0.5/debian/control	2019-07-14 08:16:40.000000000 +0000
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
- debhelper (>= 11),
+ debhelper (>= 12),
  dh-python,
  python3-all
-Standards-Version: 4.2.1
+Standards-Version: 4.4.0
 Homepage: https://github.com/Debianguru/MailWebsiteChanges
 Vcs-Git: git://jff.email/opt/git/mwc.git
 Vcs-Browser: https://jff.email/cgit/mwc.git
diff -Nru mwc-2.0.4/debian/copyright mwc-2.0.5/debian/copyright
--- mwc-2.0.4/debian/copyright	2018-10-01 21:36:31.000000000 +0000
+++ mwc-2.0.5/debian/copyright	2019-07-14 08:30:27.000000000 +0000
@@ -7,7 +7,7 @@
 License: GPL-2+
 
 Files: debian/*
-Copyright: 2014-2017 Jörg Frings-Fürst <debian@jff.email>
+Copyright: 2014-2019 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-3+
 
 License: GPL-2+
diff -Nru mwc-2.0.4/debian/mwc.links mwc-2.0.5/debian/mwc.links
--- mwc-2.0.4/debian/mwc.links	2014-05-10 10:10:58.000000000 +0000
+++ mwc-2.0.5/debian/mwc.links	2019-07-14 08:25:54.000000000 +0000
@@ -1,3 +1,2 @@
 /usr/share/mwc/mwc.py /usr/bin/mwc
-/usr/share/mwc/mwcfeedserver.py /usr/sbin/mwcfeedserver
-
+/usr/share/mwc/mwcfeedserver.py /usr/bin/mwcfeedserver
diff -Nru mwc-2.0.4/mwc.py mwc-2.0.5/mwc.py
--- mwc-2.0.4/mwc.py	2017-09-08 20:24:47.000000000 +0000
+++ mwc-2.0.5/mwc.py	2019-02-18 05:55:39.000000000 +0000
@@ -4,6 +4,8 @@
 # Copyright: (2013-2017) Michael Till Beck <Debianguru@gmx.de>
 # License: GPL-2.0+
 
+#test
+
 import io
 from lxml import etree
 import hashlib
@@ -78,7 +80,7 @@
     else:
         if link is not None:
             content = link + '\n\n' + content
-        mail = MIMEText(content, 'text', encoding)
+        mail = MIMEText(content, 'plain', encoding)
 
     mail['From'] = config.sender
     mail['To'] = receiver
@@ -93,7 +95,7 @@
         if config.smtpusername is not None:
             mailsession.login(config.smtpusername, config.smtppwd)
 
-    mailsession.sendmail(config.sender, receiver.split(','), mail.as_string())
+    mailsession.send_message(mail)
 
 
 # returns a list of all content that is stored locally for a specific site
@@ -170,7 +172,7 @@
                     sessionHashes.append(contenthash)
                     changedContents.append(content)
 
-                    subject = '[' + site['name'] + '] ' + content.title
+                    subject = '[' + site['name'] + '] ' + ("Update available" if content.title is None else content.title)
                     print('    ' + subject)
                     if config.enableMailNotifications and len(fileHashes) > 0:
                         sendAsHtml = (content.contenttype == 'html')
diff -Nru mwc-2.0.4/mwctools.py mwc-2.0.5/mwctools.py
--- mwc-2.0.4/mwctools.py	2017-09-08 20:24:47.000000000 +0000
+++ mwc-2.0.5/mwctools.py	2019-02-18 05:55:39.000000000 +0000
@@ -33,12 +33,13 @@
 
 
 class Content:
-    def __init__(self, uri, encoding, title, content, contenttype):
+    def __init__(self, uri, encoding, title, content, contenttype, additional=None):
         self.uri = uri
         self.encoding = encoding
         self.title = title
         self.content = content
         self.contenttype = contenttype
+        self.additional = additional
 
 
 # returns a short subject line
@@ -106,13 +107,13 @@
             contentList = []
 
         # run command and retrieve output
-        process = subprocess.Popen(self.command, stdout=subprocess.PIPE, shell=True, close_fds=True)
+        process = subprocess.Popen(self.command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True, close_fds=True)
         thefile = process.stdout
         result = thefile.read().decode(self.encoding, errors='ignore')
         thefile.close()
 
         if process.wait() != 0:
-            raise Exception("process terminated with an error")
+            raise Exception("process terminated with an error: " + str(process.stderr) + "\n" + result)
 
         contentList.append(Content(uri=None, encoding=self.encoding, title=None, content=result, contenttype=self.contenttype))
         return contentList