diff --git a/srcpkgs/ardour/patches/6.0-fix-build.patch b/srcpkgs/ardour/patches/6.0-fix-build.patch
new file mode 100644
index 0000000000..c3294bc07e
--- /dev/null
+++ b/srcpkgs/ardour/patches/6.0-fix-build.patch
@@ -0,0 +1,16 @@
+diff --git libs/ardour/wscript libs/ardour/wscript
+index 49cea6a..a7f8e84 100644
+--- libs/ardour/wscript
++++ libs/ardour/wscript
+@@ -379,7 +379,7 @@ def build(bld):
+ 
+     # remove '${DEFINES_ST:DEFINES}' from run_str.
+     # x86_64-w64-mingw32-as (mingw) -D flag is for debug messages
+-    if bld.env['build_target'] == 'mingw':
++    if True:
+         class asm(Task.classes['asm']): run_str = '${AS} ${ASFLAGS} ${ASMPATH_ST:INCPATHS} ${AS_SRC_F}${SRC} ${AS_TGT_F}${TGT}'
+ 
+     # operate on copy to avoid adding sources twice
+-- 
+2.26.2
+
diff --git a/srcpkgs/ardour/patches/6.0-fix-runtime.patch b/srcpkgs/ardour/patches/6.0-fix-runtime.patch
new file mode 100644
index 0000000000..3b60f99f31
--- /dev/null
+++ b/srcpkgs/ardour/patches/6.0-fix-runtime.patch
@@ -0,0 +1,16 @@
+diff --git libs/pbd/pbd/pthread_utils.h libs/pbd/pbd/pthread_utils.h
+index 6eedbd9..c459a97 100644
+--- libs/pbd/pbd/pthread_utils.h
++++ libs/pbd/pbd/pthread_utils.h
+@@ -49,7 +49,7 @@
+ #include "pbd/signals.h"
+ 
+ #define PBD_RT_STACKSIZE_PROC 0x20000 // 128kB
+-#define PBD_RT_STACKSIZE_HELP 0x08000 // 32kB
++#define PBD_RT_STACKSIZE_HELP PBD_RT_STACKSIZE_PROC
+ 
+ /* these are relative to sched_get_priority_max()
+  * see pbd_absolute_rt_priority()
+-- 
+2.26.2
+
diff --git a/srcpkgs/ardour/patches/do-not-install-wscript.patch b/srcpkgs/ardour/patches/do-not-install-wscript.patch
new file mode 100644
index 0000000000..c2403e8e09
--- /dev/null
+++ b/srcpkgs/ardour/patches/do-not-install-wscript.patch
@@ -0,0 +1,22 @@
+From a5ec4fa3acd4837e5c5914d9ce67b7bc32d4fcfb Mon Sep 17 00:00:00 2001
+From: Guido Aulisi <guido.aulisi@gmail.com>
+Date: Wed, 27 May 2020 17:23:04 +0200
+Subject: [PATCH] Do not install wscript
+
+---
+ share/plugin_metadata/wscript | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git share/plugin_metadata/wscript share/plugin_metadata/wscript
+index b7aaa92ac1..9f2559095c 100644
+--- share/plugin_metadata/wscript
++++ share/plugin_metadata/wscript
+@@ -9,7 +9,7 @@ def configure(conf):
+     pass
+ 
+ def build(bld):
+-    maps = bld.path.ant_glob ('*')
++    maps = bld.path.ant_glob ('plugin*')
+     bld.install_files (os.path.join(bld.env['DATADIR'], 'plugin_metadata'),
+                        maps)
+ 
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b0e1152a5d..e9ec7f5562 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,11 +1,11 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=5.12
-revision=5
-build_style=waf
+version=6.0
+revision=1
+build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs"
-hostmakedepends="python git graphviz doxygen pkg-config clang perl tar"
+hostmakedepends="python3 git graphviz doxygen pkg-config clang perl"
 makedepends="boost-devel liblrdf-devel liblo-devel lilv-devel suil-devel
  taglib-devel aubio-devel rubberband-devel alsa-lib-devel libsndfile-devel
  vamp-plugin-sdk-devel fftw-devel jack-devel libsamplerate-devel lv2
@@ -15,9 +15,8 @@ short_desc="Professional-grade digital audio workstation"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://ardour.org"
-
 nocross="executes test binaries during configure"
 
 do_fetch() {
-	git clone --branch=$version https://github.com/Ardour/$pkgname $pkgname-$version
+	git clone --depth 1 --branch=$version https://github.com/Ardour/ardour $pkgname-$version
 }