diff --git a/common/shlibs b/common/shlibs
index fa59870e808..6fd0f270016 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2707,7 +2707,7 @@ libkmm_mymoney.so.4 kmymoney-4.8.0_1
 libpayeeidentifier_nationalAccount.so.4 kmymoney-4.8.0_1
 libpayeeidentifier_iban_bic.so.4 kmymoney-4.8.0_1
 libkmm_payeeidentifier.so kmymoney-4.8.0_1
-libbotan-1.10.so.1 botan-1.10.13_1
+libbotan-1.11.so.34 botan-1.11.34_1
 libswipl.so.7.2 swi-prolog-7.2.3_5
 libpcre2-16.so.0 libpcre2-10.22_1
 libpcre2-32.so.0 libpcre2-10.22_1
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index c91a44cdb68..27b17a4540c 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,63 +1,80 @@
 # Template file for 'botan'
 pkgname=botan
-version=1.10.14
-revision=2
+version=1.11.34
+revision=1
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 hostmakedepends="doxygen epstopdf python"
-makedepends="libressl-devel bzip2-devel zlib-devel"
+makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="3-clause-BSD"
 homepage="http://botan.randombit.net/"
 distfiles="http://botan.randombit.net/releases/Botan-${version}.tgz"
-checksum=10ed0b394db165733ac9557d8656356b7e9744d38c61c2b9c44cba6d84ff4c1c
+checksum=59ad548f8ddb967737f102b252bab30ca0b49f039f204502394cf506ae731f16
+
+LDFLAGS="-pthread"
 
 do_configure() {
-	local _args _arch _cpu
+	local _arch _cpu _march _tune
 	case "$XBPS_TARGET_MACHINE" in
 	i686*)
-		_cpu="i686"; _arch="x86" ;;
+		_cpu="i686"; _arch="x86"; _march="i686"; _tune="i686" ;;
 	x86_64*)
-		_cpu="x86_64"; _arch="x86" ;;
+		_cpu="x86_64"; _arch="x86"; _march="x86_64"; _tune="generic" ;;
 	armv5*)
-		_cpu="armv5"; _arch="arm" ;;
+		_cpu="armv5"; _arch="armv5te"; _march="armv5te" ;;
 	armv6*)
-		_cpu="armv6"; _arch="arm" ;;
+		_cpu="armv6"; _arch="armv6"; _march="armv6" ;;
 	armv7*)
-		_cpu="armv7"; _arch="arm" ;;
+		_cpu="armv7-a"; _arch="armv7"; _march="armv7-a" ;;
 	aarch64*)
-		_cpu="armv8-a"; _arch="arm64" ;;
+		_cpu="armv8-a"; _arch="arm64"; _march="armv8-a" ;;
+	mipselhf*)
+		_cpu="mips32"; _arch="mips"; _march="mips32"; _mtune="mips32r2 --hard-float" ;;
+	mips*)
+		_cpu="mips32"; _arch="mips"; _march="mips32"; _mtune="mips32r2 --soft-float" ;;
 	esac
-	_args="--prefix=/usr"
-	_args+=" --cc=gcc"
-	_args+=" --cc-bin=$CXX"
-	_args+=" --cpu=$_cpu"
-	_args+=" --with-doxygen"
-	_args+=" --with-openssl"
-	_args+=" --with-bzip2"
-	_args+=" --with-zlib"
-	_args+=" --enable-modules=cvc"
-	_args+=" --enable-shared"
-	python configure.py ${_args}
+	python configure.py \
+		--prefix=/usr \
+		--os=linux \
+		--cc=gcc \
+		--cc-bin=$CXX \
+		--cc-abi-flags="-arch ${_arch} -stdlib=libc++" \
+		--cpu=$_cpu \
+		--with-doxygen \
+		--with-openssl \
+		--with-bzip2 \
+		--with-lzma \
+		--with-zlib \
+		--with-sqlite3 \
+		--enable-shared
 
 	sed -i Makefile \
 		-e"s;^\(CXX.*\)=.*;\1= $CXXFLAGS;" \
 		-e"s;^\(LIB_OPT.*\)=.*;\1= $LDFLAGS;" \
 		-e"s;^\(AR.*\)=.*;\1= $AR;" \
 		-e"s;^\(DESTDIR.*\)=.*;\1= $DESTDIR;" \
+		-e"s;\(--destdir\)=/usr;\1=$DESTDIR/usr;" \
 		-e's;$(DESTDIR)/bin;$(DESTDIR)/usr/bin;' \
 		-e's;$(DESTDIR)/lib;$(DESTDIR)/usr/lib;' \
 		-e's;$(DESTDIR)/include;$(DESTDIR)/usr/include;' \
 		-e's;$(DESTDIR)/share;$(DESTDIR)/usr/share;' \
 		-e's;$(AR) $(STATIC_LIB);$(AR) crus $(STATIC_LIB);'
+
+	# configure.py sometimes(?) creates invalid "-march= " and "-mtune= " without parameter
+	sed -i Makefile \
+		-e"s;-std= ;-std=c++11 ;" \
+		-e"s;-march= ;-march=${_march} ;" \
+		-e"s;-mtune= ;-mtune=${_tune} ;"
 }
 post_install() {
-	vlicense doc/license.txt
+	vlicense license.txt
 }
 
 botan-doc_package() {
 	short_desc+=" - documentation"
+	noarch=yes
 	pkg_install() {
 		vmove usr/share/doc
 	}
@@ -67,7 +84,6 @@ botan-devel_package() {
 	short_desc+=" - development files"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
-		vmove usr/bin/botan-config-${version%.*}
 		vmove usr/include
 		vmove usr/lib/*.a
 		vmove usr/lib/*.so