diff --git a/srcpkgs/conduit/patches/config.patch b/srcpkgs/conduit/patches/config.patch
new file mode 100644
index 00000000000..eb55886069f
--- /dev/null
+++ b/srcpkgs/conduit/patches/config.patch
@@ -0,0 +1,13 @@
+diff --git a/conduit-example.toml b/conduit-example.toml
+index 5eed070..bee1ded 100644
+--- a/conduit-example.toml
++++ b/conduit-example.toml
+@@ -23,7 +23,7 @@
+ #server_name = "your.server.name"
+ 
+ # This is the only directory where Conduit will save its data
+-database_path = "/var/lib/matrix-conduit/"
++database_path = "/var/lib/conduit/"
+ database_backend = "rocksdb"
+ 
+ # The port Conduit will be running on. You need to set up a reverse proxy in
diff --git a/srcpkgs/conduit/template b/srcpkgs/conduit/template
index cf972b13e25..bfea4cb3b00 100644
--- a/srcpkgs/conduit/template
+++ b/srcpkgs/conduit/template
@@ -1,6 +1,6 @@
 # Template file for 'conduit'
 pkgname=conduit
-version=0.3.0
+version=0.4.0
 revision=1
 # needs ring/rustls
 archs="x86_64* i686* aarch64* armv[67]*"
@@ -12,7 +12,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://conduit.rs/"
 distfiles="https://gitlab.com/famedly/conduit/-/archive/v${version}/conduit-v${version}.tar.gz"
-checksum=9e750ed2b8d0e986b1cdc02278124b39c11fa785f2763914836978a5a79863e3
+checksum=0d62cdd3f97e181ed98cff3a1e6c15d61358c01eeac4b5af686e5f650e77cc3f
 
 system_accounts="_conduit"
 _conduit_homedir="/var/lib/conduit"
@@ -25,6 +25,11 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	XBPS_CROSS_RUSTFLAGS+=" -latomic"
 fi
 
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+	# doctests fail on x86_64 -> i686 chroot, so run everything *but* them
+	make_check_args+=" --lib --bins --tests --benches --examples"
+fi
+
 post_install() {
 	vsconf conduit-example.toml conduit.toml
 	vsv conduit