diff --git a/extra/libunwind/PKGBUILD b/extra/libunwind/PKGBUILD
index ecff4e50b..438c460c6 100644
--- a/extra/libunwind/PKGBUILD
+++ b/extra/libunwind/PKGBUILD
@@ -9,13 +9,14 @@
 
 pkgname=libunwind
 pkgver=1.6.2
-pkgrel=1.1
+pkgrel=2
 pkgdesc='Portable and efficient C programming interface (API) to determine the call-chain of a program'
 arch=('x86_64')
 url='https://www.nongnu.org/libunwind/'
 license=('GPL')
 depends=('xz' 'zlib')
 makedepends=('texlive-core')
+options=('debug')
 source=("https://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
         'https://github.com/libunwind/libunwind/commit/e85b65cec757ef589f28957d0c6c21c498a03bdf.patch')
 sha512sums=('1d17dfb14f99a894a6cda256caf9ec481c14068aaf8f3a85fa3befa7c7cca7fca0f544a91a3a7c2f2fc55bab19b06a67ca79f55ac9081151d94478c7f611f8f7'
@@ -48,4 +49,4 @@ package() {
   make DESTDIR="$pkgdir" install
 }
 
-# vim:set ts=2 sw=2 et:
+# vim:set sw=2 sts=-1 et:
diff --git a/extra/libunwind/keys/pgp/1675C8DA2EF907FB116EB709EC52B396E6874AF2.asc b/extra/libunwind/keys/pgp/1675C8DA2EF907FB116EB709EC52B396E6874AF2.asc
new file mode 100644
index 000000000..e99e5420b
--- /dev/null
+++ b/extra/libunwind/keys/pgp/1675C8DA2EF907FB116EB709EC52B396E6874AF2.asc
@@ -0,0 +1,28 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFhwJ5gBEADS1cfXVzIkq8VtmZZyKveidD8+sLfzz5sGqyObBMQtHNWlyjkL
+n5RppYQYGBQQCu61y1Fo4vwo9vuafYG6nkozrdhhdPyHFkx2kGxvKeDEoV4NO3/q
+z3ImeLE4Vq/ZaLThgKTz1qixvjPIRuYdMgN0jh2vS+LR2rDgemjNPtnSyWrBT1a2
+DGiN3m4//rW3GTQLq0gXShYhtSJaxpB2q0Tb4g7sC/jSvPat7/ZTs0MXQR3vy7fk
+pclOu3HLWx8rNY1xxxrED2LWbLvhGJCxHRi4Ksa7G53+3JTpWFP48axPPqxZUo4h
+yW2MKgUbSg6jhKa8GVjW1wQNjJsX1XbGkjkyNx+nPO/0qrgcD7yTaIgG6iC7zZhV
+7iAMHI72AoEnshk/Av9VD/BDL0CGX+hyPbRcVN/OZnWJv+VCJwhZrndlUmrr/s6N
+I4L2R84rpSniPN9a6lhTbwze13siJRIzZtkYbg3BEX1QlOJZUJtVwUPEy7w4mkmo
+hmkZrU2Zn8mKuQkJ89ldps39RsGhZR0kUrYKSfuGymLCDvBbrXhHu1WP5GS1yxVs
+QPCbsG2bTvkOldcVAnMdJW+RKR7lzQoqmozoe2stS8++zov6XKtEaVLcuMtA2GLB
+lLqv44dZOhC57nZa8QtODFWBbTNXZHvlIlhEt/tSImdYhF/+x6pQ4rhkrwARAQAB
+tCBEYXZlIFdhdHNvbiA8ZGF2ZWp3YXRzb25AZmIuY29tPokCPQQTAQoAJwUCWHAn
+mAIbAwUJB4YfgAULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRDsUrOW5odK8nkY
+EACfmm/py+6GAhW+BkHvM3UJWfgdc086DXc2/GJRIOXTwYPM8W00tYESHEY1zow0
+zkFomi0mno6WgGAvibG3KCV2fCO7E5Yxi3sFtlACLGIs8GSREfYbchYx1I7mBI7O
+cRHJ2shIJRvDi0ArOo/ybKMt8vkImjy6NBttxQ9jtOsV7DkeyxUhbQnr6LgECPzk
+hUF98QQYgTZTBqM8NoSiQy2yivLOkPOwMFy+MiPzzUEYv3f9BK/KcKuL4i6C/3RU
+kyOMO5C0t3KCasZkHf0rLba1+fN2VdXr4qNRwqjtZ5WGSdgWWa5hz958g4PLP/Ke
+lKTBzrTjoKAm3ROHs1D+lPcTx9pGiH6973T/coq7P248/01Oze9Ve425NKbwFU7Z
+9HUjmE2rY9mMK3eMQcFI8XQne9R/TMdFzfHkObtwjFtFfREfeTyus/5RUb/6Ld6u
+lbtz2tgOrWWf2e/yL3Hum7PIl3xeaRoG3W4htJPSIZdxVDipzyObQdW/pn5LFBZj
+Wr6FUdokIdnwRyrHQBPCNne3pwmwLCiQjIXr/S6mrDEFbK0MBcf1m9QbCnS2PJd3
+833wloYMh1jZCCQD/rb7W6PyQEUDPxyz4CXnWbpE2VF4bi4+fOZ22F9omGUoq8a6
+cqJG5xhoGylsb0QtdqddBw8CMTRrustDjX9xKdVlQjZ3wQ==
+=NqAL
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/extra/libunwind/keys/pgp/5C96BDEAF5F47FB02BD4F6B965D98560914F3F48.asc b/extra/libunwind/keys/pgp/5C96BDEAF5F47FB02BD4F6B965D98560914F3F48.asc
new file mode 100644
index 000000000..dcbdfea45
--- /dev/null
+++ b/extra/libunwind/keys/pgp/5C96BDEAF5F47FB02BD4F6B965D98560914F3F48.asc
@@ -0,0 +1,36 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=dO+5
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/extra/libunwind/keys/pgp/75D2CFC56CC2E935A4143297015A268A17D55FA4.asc b/extra/libunwind/keys/pgp/75D2CFC56CC2E935A4143297015A268A17D55FA4.asc
new file mode 100644
index 000000000..d3d0702f7
--- /dev/null
+++ b/extra/libunwind/keys/pgp/75D2CFC56CC2E935A4143297015A268A17D55FA4.asc
@@ -0,0 +1,23 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBF6DZiMBDADg3yeD7qiZMyDzu+J2LlH6CCjOyKiaxP0MAa7aRK7GMJWVUY+O
+5K0FJ65UUrdJri5jJn8iv7WcQFNbOUfgOqX7hrGS3U3ecW2cG7LlGXNuRwmTHGox
+zEL+KtvbqN/2pbCizBcXC1fNbpgbIRaqDI4wTz884n264pb/l88yGHFrZz6c2q4X
+3TAX8uB7UzRHGlfUshO7UUZ4cBqAci4jCuN1F2gSmjeQiLs2lFgpn4z1XjNuZ17S
+9p8M1pUAf7NRM27nKAEj8nyRMJwmbBtis38RqNdmRS46sS4Y8qFmy7MB7oiyJtOk
+ASsKHjXAukcF4uRX9yI/clOyV/Z5RQKp6UIYUHhY6hvf4lARUstP5qxyQq0RmrvS
+1PKdWNZD0gKNimIOhyHbXxLUn2Z6sd5FdArM4/Y5tD/LGVua2OmmHT799l9AtVlR
+gAldFTbqv+RvBUOhSP8UWsoLq0Bmoc2PbpBobUxyiJ0CS3jxH2+++f7eL22mGmje
+WfNPy7sHUFRzyN0AEQEAAbQjRGF2ZSBXYXRzb24gPGRhZGUud2F0c29uQGdtYWls
+LmNvbT6JAdQEEwEKAD4WIQR10s/FbMLpNaQUMpcBWiaKF9VfpAUCXoNmIwIbAwUJ
+A8JnAAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRABWiaKF9VfpFB4C/9xTwGl
+2VZ3Nw13L9bQOC+ALm2CeCWl9cr56hiGPoyDsGFgutmQyl8EndUc9hgvPvye4MCR
+oy0M59BmBK9wDtxMAA1zEUqKzpLEdmRTSeo/UbJgNNKAp6nd87VlvVREFbxUwe74
+vsBYwHqbj0QlTN8TNgmZLRCXUbtUHi08eKcWJ2tosfrThSgjzL86XxkJ8fEDdQcB
+FtXNMP6dPefuFUCK2FYMBi6amlTZrtwatJj2Ul3QbxgMz6L2UauSAuKsBh48vLJf
+rfLoRsbOd9dqVGvArpg94KpD9eW3Ac5ydJTrC0R/L/3eVvCTcrPtAxlsmnRTz6+J
+PqONvi1KL7aYSHtPPCp+1F4s3lbHm3gAfv4SuZYeOcvaXoNGiHobZsb+fLNUmIQI
+CI8/PiG3tVdFf9WRKGjDK9v9cOTQ3FSiLEvDVDdbPC5zJVk+6Gl035bzNOlYl4ik
+ZbWKvPqwP9syxhL9uprnsGaP/8pGJbbWJ2rX1UvqGuA+A5cJCOE1fh34lYk=
+=AlZu
+-----END PGP PUBLIC KEY BLOCK-----