diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 6e3b437df3e..e73c521446d 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.110 2020/04/17 14:49:19 semarie Exp $
+# $OpenBSD: Makefile,v 1.111 2020/04/18 06:47:10 semarie Exp $
 
 ONLY_FOR_ARCHS =	${RUST_ARCHS}
 
@@ -19,6 +19,8 @@ CLIPPY_V =		0.0.212
 RUSTFMT_V =		1.4.11
 DISTNAME =		rustc-${V}-src
 
+REVISION =		0
+
 # rustc bootstrap version
 BV-aarch64 =		1.42.0-20200315
 BV-amd64 =		1.42.0-20200310
diff --git a/lang/rust/pkg/PLIST-clippy b/lang/rust/pkg/PLIST-clippy
index 533a6309b99..3c4857a1b58 100644
--- a/lang/rust/pkg/PLIST-clippy
+++ b/lang/rust/pkg/PLIST-clippy
@@ -1,6 +1,6 @@
-@comment $OpenBSD: PLIST-clippy,v 1.1 2018/12/16 09:19:57 semarie Exp $
+@comment $OpenBSD: PLIST-clippy,v 1.2 2020/04/18 06:47:10 semarie Exp $
 @bin bin/cargo-clippy
-@bin bin/clip${MODPY_PY_PREFIX}driver
+@bin bin/clippy-driver
 share/doc/clippy/
 share/doc/clippy/LICENSE-APACHE
 share/doc/clippy/LICENSE-MIT
diff --git a/lang/rust/pkg/PLIST-gdb b/lang/rust/pkg/PLIST-gdb
index 6d64df00c56..f7eec14c03e 100644
--- a/lang/rust/pkg/PLIST-gdb
+++ b/lang/rust/pkg/PLIST-gdb
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PLIST-gdb,v 1.2 2019/04/17 06:56:00 semarie Exp $
+@comment $OpenBSD: PLIST-gdb,v 1.3 2020/04/18 06:47:10 semarie Exp $
 bin/rust-gdb
 @comment bin/rust-gdbgui
+lib/rustlib/etc/${MODPY_PYCACHE}gdb_load_rust_pretty_printers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/rustlib/etc/${MODPY_PYCACHE}gdb_rust_pretty_printing.${MODPY_PYC_MAGIC_TAG}pyc
 lib/rustlib/etc/gdb_load_rust_pretty_printers.py
-lib/rustlib/etc/gdb_load_rust_pretty_printers.pyc
 lib/rustlib/etc/gdb_rust_pretty_printing.py
-lib/rustlib/etc/gdb_rust_pretty_printing.pyc
diff --git a/lang/rust/pkg/PLIST-main b/lang/rust/pkg/PLIST-main
index 814e266ab2a..232f31a21b9 100644
--- a/lang/rust/pkg/PLIST-main
+++ b/lang/rust/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.25 2020/03/21 05:23:59 semarie Exp $
+@comment $OpenBSD: PLIST-main,v 1.26 2020/04/18 06:47:10 semarie Exp $
 @conflict cargo-<0.20.0
 @pkgpath devel/cargo
 @bin bin/cargo
@@ -10,10 +10,11 @@
 @so lib/libtest-b18d3ed20be013b9.so
 lib/rustlib/
 lib/rustlib/etc/
+${MODPY_COMMENT}lib/rustlib/etc/${MODPY_PYCACHE}/
+lib/rustlib/etc/${MODPY_PYCACHE}debugger_pretty_printers_common.${MODPY_PYC_MAGIC_TAG}pyc
+@comment lib/rustlib/etc/${MODPY_PYCACHE}lldb_rust_formatters.${MODPY_PYC_MAGIC_TAG}pyc
 lib/rustlib/etc/debugger_pretty_printers_common.py
-lib/rustlib/etc/debugger_pretty_printers_common.pyc
 @comment lib/rustlib/etc/lldb_rust_formatters.py
-@comment lib/rustlib/etc/lldb_rust_formatters.pyc
 lib/rustlib/${TRIPLE_ARCH}/
 lib/rustlib/${TRIPLE_ARCH}/lib/
 lib/rustlib/${TRIPLE_ARCH}/lib/liballoc-b74634df3470a088.rlib