diff --git a/.SRCINFO b/.SRCINFO
index 2dae71292ae0..a078e1927d02 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,29 @@
 pkgbase = whipper-git
 	pkgdesc = A Unix CD ripper aiming for accuracy over speed -- forked from morituri
-	pkgver = 0.7.4.dev50+ge26bb24
+	pkgver = 0.8.1.dev14+gbbd28c6
 	pkgrel = 1
 	url = https://github.com/whipper-team/whipper
 	arch = any
 	license = GPL3
-	checkdepends = python2-twisted
+	checkdepends = python-twisted
 	makedepends = git
-	makedepends = python2-setuptools-scm
-	depends = accuraterip-checksum
+	makedepends = python-setuptools-scm
 	depends = cdrdao
 	depends = flac
 	depends = libcdio-paranoia
 	depends = libsndfile
-	depends = python2-mutagen
-	depends = python2-musicbrainzngs
-	depends = python2-gobject
-	depends = python2-pycdio
-	depends = python2-requests
-	depends = python2-setuptools
+	depends = python-mutagen
+	depends = python-musicbrainzngs
+	depends = python-gobject
+	depends = python-pycdio
+	depends = python-requests
+	depends = python-ruamel-yaml
+	depends = python-setuptools
 	depends = sox
 	provides = whipper
+	provides = accuraterip-checksum
 	conflicts = whipper
+	conflicts = accuraterip-checksum
 	source = git+https://github.com/whipper-team/whipper.git#branch=develop
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 4a02c9858c53..c35c92b5f595 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,54 +8,58 @@
 # Based on community/morituri and aur/morituri-git PKGBUILDs
 
 pkgname=whipper-git
-pkgver=0.7.4.dev50+ge26bb24
+pkgver=0.8.1.dev14+gbbd28c6
 pkgrel=1
 pkgdesc='A Unix CD ripper aiming for accuracy over speed -- forked from morituri'
 arch=('any')
 url='https://github.com/whipper-team/whipper'
 license=('GPL3')
 depends=(
-    'accuraterip-checksum'          # for accuraterip-checksum calculation
     'cdrdao'                        # for session, TOC, pregap, and ISRC extraction
     'flac'                          # for reading flac files
     'libcdio-paranoia'              # for the actual ripping
     'libsndfile'                    # for reading wav files
-    'python2-mutagen'               # for metadata handling
-    'python2-musicbrainzngs'        # for metadata lookup
-    'python2-gobject'
-    'python2-pycdio'                # for storing drive identification in config file
-    'python2-requests'              # for retrieving AccurateRip database entries
-    'python2-setuptools'            # for plugin support
+    'python-mutagen'                # for metadata handling
+    'python-musicbrainzngs'         # for metadata lookup
+    'python-gobject'
+    'python-pycdio'                 # for storing drive identification in config file
+    'python-requests'               # for retrieving AccurateRip database entries
+    'python-ruamel-yaml'            # for generating and reading logs
+    'python-setuptools'             # for plugin support
     'sox'                           # for track peak detection'
     )
 makedepends=(
     'git'
-    'python2-setuptools-scm'        # for VCS(/SCM) versioning
+    'python-setuptools-scm'        # for VCS(/SCM) versioning
     )
 checkdepends=(
-    'python2-twisted'
+    'python-twisted'
     )
-provides=("${pkgname%-git}")
-conflicts=("${pkgname%-git}")
+provides=("${pkgname%-git}" 'accuraterip-checksum')
+conflicts=("${pkgname%-git}" 'accuraterip-checksum')
 source=("git+${url}.git#branch=develop")
 md5sums=('SKIP')
 
 pkgver() {
     cd "$srcdir/${pkgname%-git}"
-    python2 setup.py --version
+    python3 setup.py --version
 }
 
 build() {
     cd "$srcdir/${pkgname%-git}"
-    python2 setup.py build
+    python3 setup.py build
 }
 
 check() {
     cd "$srcdir/${pkgname%-git}"
-    python2 -m unittest discover
+    python3 -m venv --system-site-packages --clear test-venv
+    source ./test-venv/bin/activate
+    python3 setup.py install --skip-build
+    python3 -m unittest discover
+    deactivate
 }
 
 package() {
     cd "$srcdir/${pkgname%-git}"
-    python2 setup.py install --skip-build --root="${pkgdir}"/ --optimize=1
+    python3 setup.py install --skip-build --root="${pkgdir}"/ --optimize=1
 }