diff --git a/html2text/PKGBUILD b/html2text/PKGBUILD
index ecccaae48..a4ee00840 100644
--- a/html2text/PKGBUILD
+++ b/html2text/PKGBUILD
@@ -1,23 +1,33 @@
-# $Id: PKGBUILD 5125 2009-11-06 16:14:08Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributions from AUR: https://aur.archlinux.org/packages/html2text-with-utf8/
 
 pkgname=html2text
 pkgver=1.3.2a
-pkgrel=8
+pkgrel=9
 pkgdesc="A HTML to text converter"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.mbayer.de/html2text"
 license=('GPL2')
 depends=('gcc-libs')
-source=(http://ftp.ibiblio.org/pub/linux/apps/www/converters/$pkgname-$pkgver.tar.gz)
-md5sums=('6097fe07b948e142315749e6620c9cfc')
+source=("http://www.mbayer.de/html2text/downloads/${pkgname}-${pkgver}.tar.gz"
+  "http://www.mbayer.de/html2text/downloads/patch-utf8-${pkgname}-${pkgver}.diff")
+sha256sums=('000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392'
+            'be4e90094d2854059924cb2c59ca31a5e9e0e22d2245fa5dc0c03f604798c5d1')
 
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure
-  make || return 1
-  install -D -m 755 html2text $pkgdir/usr/bin/html2text
-  install -D -m 644 html2text.1.gz $pkgdir/usr/share/man/man1/html2text.1.gz
-  install -D -m 644 html2textrc.5.gz $pkgdir/usr/share/man/man5/html2textrc.5.gz
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 < "${srcdir}/patch-utf8-html2text-1.3.2a.diff"
 }
 
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure
+  make -s -j $(nproc)
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  install -Dpm755 'html2text' "${pkgdir}/usr/bin/html2text"
+  install -Dpm644 'html2text.1.gz' "${pkgdir}/usr/share/man/man1/html2text.1.gz"
+  install -Dpm644 'html2textrc.5.gz' "${pkgdir}/usr/share/man/man5/html2textrc.5.gz"
+}