diff --git a/doc/user.rst b/doc/user.rst
index fe4825a4d..1bc8f6158 100644
--- a/doc/user.rst
+++ b/doc/user.rst
@@ -55,7 +55,7 @@ and unpack it (or `clone the git repository
 
 In any case, you need:
 
-* a C++17 compiler (e.g. GCC 8 or clang 5)
+* a C++17 compiler (e.g. GCC 8 or clang 7)
 * `Meson 0.49.0 <http://mesonbuild.com/>`__ and `Ninja
   <https://ninja-build.org/>`__
 * Boost 1.58
diff --git a/meson.build b/meson.build
index 7806d837b..b9b77ce76 100644
--- a/meson.build
+++ b/meson.build
@@ -24,8 +24,8 @@ c_compiler = meson.get_compiler('c')
 
 if compiler.get_id() == 'gcc' and compiler.version().version_compare('<8')
   warning('Your GCC version is too old.  You need at least version 8.')
-elif compiler.get_id() == 'clang' and compiler.version().version_compare('<5')
-  warning('Your clang version is too old.  You need at least version 5.')
+elif compiler.get_id() == 'clang' and compiler.version().version_compare('<7')
+  warning('Your clang version is too old.  You need at least version 7.')
 endif
 
 version_conf = configuration_data()
@@ -79,12 +79,6 @@ test_cxxflags = test_common_flags + [
   '-Wno-non-virtual-dtor',
 ]
 
-if compiler.get_id() == 'clang'
-  # Workaround for clang bug
-  # https://bugs.llvm.org/show_bug.cgi?id=32611
-  test_cxxflags += '-funwind-tables'
-endif
-
 test_cflags = test_common_flags + [
   '-Wmissing-prototypes',
   '-Wshadow',