diff --git a/srcpkgs/ardour/patches/fix-gcc6-ambigous_max.patch b/srcpkgs/ardour/patches/fix-gcc6-ambigous_max.patch
deleted file mode 100644
index 50783d5f27c..00000000000
--- a/srcpkgs/ardour/patches/fix-gcc6-ambigous_max.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-The value 1.0 without f is a double constant and gcc6 complains
-about a not existing template for max(double,float).
-
---- libs/ardour/parameter_descriptor.cc	2016-10-04 09:19:13.780997674 +0200
-+++ libs/ardour/parameter_descriptor.cc	2016-10-04 09:19:45.237999989 +0200
-@@ -178,8 +178,8 @@
- 			largestep = largestep / logf(30.0f);
- 		} else if (integer_step) {
- 			smallstep = 1.0;
--			step      = std::max(1.0, rint(step));
--			largestep = std::max(1.0, rint(largestep));
-+			step      = std::max(1.0f, rint(step));
-+			largestep = std::max(1.0f, rint(largestep));
- 		}
- 	}
- }
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index 24125c4df5d..974f791e5be 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,11 +1,14 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=4.7
-revision=2
+version=5.8
+revision=1
 build_style=waf
 configure_args="--with-backends=jack,alsa --libjack=weak --optimize --docs"
 hostmakedepends="python 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 sratom-devel gtkmm2-devel"
+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
+ sratom-devel gtkmm2-devel libarchive-devel"
 short_desc="Professional-grade digital audio workstation"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2"