diff --git a/common/shlibs b/common/shlibs
index 4e69b5ccb4..140a3893f9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1318,16 +1318,16 @@ libjsoncpp.so.24 jsoncpp-1.9.4_1
 libesmtp.so.6 libesmtp-1.0.6_21
 libcaca.so.0 libcaca-0.99.beta18_3
 libcaca++.so.0 libcaca-0.99.beta18_3
-libunwind.so.8 libunwind-1.1_1
-libunwind-ptrace.so.0 libunwind-1.1_1
-libunwind-x86_64.so.8 libunwind-1.1_1
-libunwind-x86.so.8 libunwind-1.1_1
-libunwind-arm.so.8 libunwind-1.1_4
-libunwind-mips.so.8 libunwind-1.1_4
-libunwind-aarch64.so.8 libunwind-1.2rc1_1
-libunwind-ppc32.so.8 libunwind-1.2.1_1
-libunwind-ppc64.so.8 libunwind-1.2.1_1
-libunwind-setjmp.so.0 libunwind-1.4_1
+libunwind.so.8 libunwind-1.5.0_3
+libunwind-ptrace.so.0 libunwind-1.5.0_3
+libunwind-x86_64.so.8 libunwind-1.5.0_3
+libunwind-x86.so.8 libunwind-1.5.0_3
+libunwind-arm.so.8 libunwind-1.5.0_3
+libunwind-mips.so.8 libunwind-1.5.0_3
+libunwind-aarch64.so.8 libunwind-1.5.0_3
+libunwind-ppc32.so.8 libunwind-1.5.0_3
+libunwind-ppc64.so.8 libunwind-1.5.0_3
+libunwind-setjmp.so.0 libunwind-1.5.0_3
 libmicrohttpd.so.12 libmicrohttpd-0.9.48_1
 libmicrodns.so.0 libmicrodns-0.1.0_1
 libgit2.so.1.0 libgit2-1.0.1_3
diff --git a/srcpkgs/libunwind/template b/srcpkgs/libunwind/template
index 3ef73d90d5..d4819ce54a 100644
--- a/srcpkgs/libunwind/template
+++ b/srcpkgs/libunwind/template
@@ -1,7 +1,7 @@
 # Template file for 'libunwind'
 pkgname=libunwind
 version=1.5.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="libtool automake"
 makedepends="liblzma-devel"
@@ -14,6 +14,12 @@ checksum=90337653d92d4a13de590781371c604f9031cdb50520366aa1e3a91e1efb1017
 
 CFLAGS="-fcommon"
 
+# Enable C++ exception handling (doesn't work too well on x86)
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*) ;;
+	*) configure_args+=" --enable-cxx-exceptions" ;;
+esac
+
 # LDFLAGS is necessary because libunwind.so itself uses getcontext/setcontext
 case "$XBPS_TARGET_MACHINE" in
 	i686-musl) LDFLAGS=" -lssp_nonshared" ;;