diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -140,7 +140,7 @@
 PYTHON2_DEFAULT?=	2.7
 # Possible values: 3.0, 3.1, 3.2, 3.3
 RUBY_DEFAULT?=		3.1
-# Possible values: rust, rust-nightly
+# Possible values: rust, rust-nightly, rust-upstream
 RUST_DEFAULT?=		rust
 # Possible values: 4.13, 4.16
 SAMBA_DEFAULT?=		4.16
diff --git a/lang/rust-bin/Makefile b/lang/rust-bin/Makefile
new file mode 100644
--- /dev/null
+++ b/lang/rust-bin/Makefile
@@ -0,0 +1,53 @@
+PORTNAME=	rust
+PORTVERSION=	1.75.0
+CATEGORIES=	lang
+MASTER_SITES=	https://dev-static.rust-lang.org/dist/
+DISTFILES=	rust-${DISTVERSION}-x86_64-unknown-freebsd${EXTRACT_SUFX} \
+		rust-std-${DISTVERSION}-wasm32-unknown-unknown${EXTRACT_SUFX}
+PKGNAMESUFFIX=	bin
+
+MAINTAINER=	mikael@FreeBSD.org
+COMMENT=	rust toolchain from www.rust-lang.org
+WWW=		https://www.rust-lang.org/
+
+LICENSE=	APACHE20 MIT
+LICENSE_COMB=	dual
+
+ONLY_FOR_ARCHS=		amd64
+ONLY_FOR_ARCHS_REASON=	only amd64 version available upstream
+
+USES=		cpe tar:xz
+
+CPE_VENDOR=	rust-lang
+
+CONFLICTS_INSTALL?=	rust rust-nightly
+
+NO_BUILD=	yes
+
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} != FreeBSD
+IGNORE=		is only for FreeBSD
+.endif
+
+do-install:
+.for _c in rust-${DISTVERSION}-x86_64-unknown-freebsd rust-std-${DISTVERSION}-wasm32-unknown-unknown
+	cd ${WRKDIR}/${_c} && \
+		${SH} install.sh \
+		--docdir="${STAGEDIR}${DOCSDIR}" \
+		--mandir="${STAGEDIR}${PREFIX}/share/man" \
+		--prefix="${STAGEDIR}${PREFIX}"
+.endfor
+
+# do some cleanup
+	@${RM}	${STAGEDIR}${DOCSDIR}/*.old \
+		${STAGEDIR}${PREFIX}/lib/rustlib/components \
+		${STAGEDIR}${PREFIX}/lib/rustlib/install.log \
+		${STAGEDIR}${PREFIX}/lib/rustlib/manifest-* \
+		${STAGEDIR}${PREFIX}/lib/rustlib/rust-installer-version \
+		${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh
+	@${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib \
+		${STAGEDIR}${PREFIX}/libexec -exec ${FILE} -i {} + | \
+		${AWK} -F: '/executable|sharedlib/ { print $$1 }' | ${XARGS} ${STRIP_CMD}
+
+.include <bsd.port.post.mk>
diff --git a/lang/rust-bin/distinfo b/lang/rust-bin/distinfo
new file mode 100644
--- /dev/null
+++ b/lang/rust-bin/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1704484750
+SHA256 (rust-1.75.0-x86_64-unknown-freebsd.tar.xz) = f545a3a30f513cbb581507b57dd0aaa11e846b7bb942f1a48493c8d5dabca613
+SIZE (rust-1.75.0-x86_64-unknown-freebsd.tar.xz) = 165775344
+SHA256 (rust-std-1.75.0-wasm32-unknown-unknown.tar.xz) = bad7d71053cb7385fa4de8bdc87824793b452633f884cc0df9cf6e7d0a549e35
+SIZE (rust-std-1.75.0-wasm32-unknown-unknown.tar.xz) = 17754428
diff --git a/lang/rust-bin/pkg-descr b/lang/rust-bin/pkg-descr
new file mode 100644
--- /dev/null
+++ b/lang/rust-bin/pkg-descr
@@ -0,0 +1,12 @@
+Rust is an open-source systems programming language that runs blazingly
+fast, prevents almost all crashes, and eliminates data races.
+Some of its features:
+
+  - Algebraic data types, type inference
+  - Pattern matching and closures
+  - Concurrency without data races
+  - Guaranteed memory safety
+  - Optional garbage collection
+  - Zero-cost abstractions
+  - Minimal runtime
+  - Efficient C bindings
diff --git a/lang/rust-bin/pkg-plist b/lang/rust-bin/pkg-plist
new file mode 100644
--- /dev/null
+++ b/lang/rust-bin/pkg-plist
@@ -0,0 +1,165 @@
+bin/cargo
+bin/cargo-clippy
+bin/cargo-fmt
+bin/clippy-driver
+bin/rls
+bin/rust-analyzer
+bin/rust-demangler
+bin/rust-gdb
+bin/rust-gdbgui
+bin/rust-lldb
+bin/rustc
+bin/rustdoc
+bin/rustfmt
+etc/bash_completion.d/cargo
+lib/libcstr-8fef5eb5dde02523.so
+lib/libdarling_macro-03e3a07001fcc85f.so
+lib/libderivative-b9c03e755e96c0d9.so
+lib/libderive_more-8fc73f64ccb3a279.so
+lib/libderive_setters-0a84556ba4a40edb.so
+lib/libdisplaydoc-b3fa195be417d327.so
+lib/libicu_provider_macros-f08e6226014d0d89.so
+lib/libproc_macro_hack-9763c1b4212e4b40.so
+lib/librustc_driver-b7d2799bab0dd9b9.so
+lib/librustc_fluent_macro-2c83625a601415fd.so
+lib/librustc_macros-34fd28cec744fa1d.so
+lib/libserde_derive-37b46587d9662e77.so
+lib/libstd-0d6964a847d65faf.so
+lib/libtest-9531ab6f4defe7d3.so
+lib/libthiserror_core_impl-e372e5bbce81ea3e.so
+lib/libthiserror_impl-f582076500c0c46b.so
+lib/libtracing_attributes-ba651d28ed4fa19b.so
+lib/libunic_langid_macros_impl-069856dfd028e909.so
+lib/libyoke_derive-abe96ba32b7f67bf.so
+lib/libzerofrom_derive-2cda16eed2954ef3.so
+lib/libzerovec_derive-eb89fdd948ca3291.so
+lib/rustlib/etc/gdb_load_rust_pretty_printers.py
+lib/rustlib/etc/gdb_lookup.py
+lib/rustlib/etc/gdb_providers.py
+lib/rustlib/etc/lldb_commands
+lib/rustlib/etc/lldb_lookup.py
+lib/rustlib/etc/lldb_providers.py
+lib/rustlib/etc/rust_types.py
+lib/rustlib/wasm32-unknown-unknown/lib/libaddr2line-b2ec0ad95c9facfa.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/libadler-b5f96e6697835e0e.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/liballoc-97dcb35e0f375abc.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/libcfg_if-ba95d7c4fd3f22d6.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/libcompiler_builtins-6ac798d4e57a2704.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/libcore-ac361a5c85642c4e.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/libdlmalloc-ab7006847908b5ae.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/libgetopts-729faac53946771e.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/libgimli-6a330ef164cb0da1.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/libhashbrown-4afefc0fd3046a0c.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/liblibc-9a6877e2a1a2170d.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/libmemchr-2f44f190ad78573a.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/libminiz_oxide-5edf89e6182663e3.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/libobject-4a8dacba687977ce.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/libpanic_abort-de41eddc40684e1a.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/libpanic_unwind-d6e52b2778ee7068.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/libproc_macro-43e2be7defea0852.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/librustc_demangle-91a498a964abbae7.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/librustc_std_workspace_alloc-f41c60f3ed147d58.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/librustc_std_workspace_core-12af700a6c796dcc.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/librustc_std_workspace_std-6e9e7cf2f3d12dfc.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/libstd-0a1cbf5fdf3ff00d.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/libstd_detect-e6e1d218b776a2d9.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/libsysroot-86894b2140ba2f30.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/libtest-1f81f65d78a34350.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/libunicode_width-a43b39ed42e68ecc.rlib
+lib/rustlib/wasm32-unknown-unknown/lib/libunwind-7d5800223668f5bb.rlib
+lib/rustlib/x86_64-unknown-freebsd/analysis/removed.json
+lib/rustlib/x86_64-unknown-freebsd/bin/gcc-ld/ld.lld
+lib/rustlib/x86_64-unknown-freebsd/bin/gcc-ld/ld64.lld
+lib/rustlib/x86_64-unknown-freebsd/bin/gcc-ld/lld-link
+lib/rustlib/x86_64-unknown-freebsd/bin/gcc-ld/wasm-ld
+lib/rustlib/x86_64-unknown-freebsd/bin/llc
+lib/rustlib/x86_64-unknown-freebsd/bin/llvm-ar
+lib/rustlib/x86_64-unknown-freebsd/bin/llvm-as
+lib/rustlib/x86_64-unknown-freebsd/bin/llvm-cov
+lib/rustlib/x86_64-unknown-freebsd/bin/llvm-dis
+lib/rustlib/x86_64-unknown-freebsd/bin/llvm-nm
+lib/rustlib/x86_64-unknown-freebsd/bin/llvm-objcopy
+lib/rustlib/x86_64-unknown-freebsd/bin/llvm-objdump
+lib/rustlib/x86_64-unknown-freebsd/bin/llvm-profdata
+lib/rustlib/x86_64-unknown-freebsd/bin/llvm-readobj
+lib/rustlib/x86_64-unknown-freebsd/bin/llvm-size
+lib/rustlib/x86_64-unknown-freebsd/bin/llvm-strip
+lib/rustlib/x86_64-unknown-freebsd/bin/opt
+lib/rustlib/x86_64-unknown-freebsd/bin/rust-lld
+lib/rustlib/x86_64-unknown-freebsd/lib/libaddr2line-70ef4e5cbc6c1f57.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libadler-54d69bc6178e3b45.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/liballoc-2c0247338c2ff708.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libcfg_if-137bdb893293f6c2.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libcompiler_builtins-a1048af6214be916.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libcore-6913833f09e2a106.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libgetopts-aec337e71e9b3b6c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libgimli-86cd0731a548ff19.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libhashbrown-51f769e72f79a229.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/liblibc-2a7dee2d5af6d62a.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libmemchr-41a7571ab28423af.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libminiz_oxide-fc464bf8dab9ab96.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libobject-af9806ed9ecba529.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libpanic_abort-a7c3731383d510b6.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libpanic_unwind-8efc99ad55c82a5f.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libproc_macro-61fa4295590dae56.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libprofiler_builtins-58a52b02471ec04c.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/librustc-stable_rt.asan.a
+lib/rustlib/x86_64-unknown-freebsd/lib/librustc-stable_rt.msan.a
+lib/rustlib/x86_64-unknown-freebsd/lib/librustc-stable_rt.tsan.a
+lib/rustlib/x86_64-unknown-freebsd/lib/librustc_demangle-07e138f618d7ec85.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/librustc_std_workspace_alloc-1c738da014ae4394.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/librustc_std_workspace_core-cfc5f31e215c9308.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/librustc_std_workspace_std-f82d0a6256584235.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libstd-0d6964a847d65faf.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libstd-0d6964a847d65faf.so
+lib/rustlib/x86_64-unknown-freebsd/lib/libstd_detect-5f9230f5aa9a510a.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libsysroot-e461629e93d63997.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libtest-9531ab6f4defe7d3.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libtest-9531ab6f4defe7d3.so
+lib/rustlib/x86_64-unknown-freebsd/lib/libunicode_width-0553d19e8f27aefc.rlib
+lib/rustlib/x86_64-unknown-freebsd/lib/libunwind-0ad5fa639536d228.rlib
+libexec/rust-analyzer-proc-macro-srv
+share/man/man1/cargo-add.1.gz
+share/man/man1/cargo-bench.1.gz
+share/man/man1/cargo-build.1.gz
+share/man/man1/cargo-check.1.gz
+share/man/man1/cargo-clean.1.gz
+share/man/man1/cargo-doc.1.gz
+share/man/man1/cargo-fetch.1.gz
+share/man/man1/cargo-fix.1.gz
+share/man/man1/cargo-generate-lockfile.1.gz
+share/man/man1/cargo-help.1.gz
+share/man/man1/cargo-init.1.gz
+share/man/man1/cargo-install.1.gz
+share/man/man1/cargo-locate-project.1.gz
+share/man/man1/cargo-login.1.gz
+share/man/man1/cargo-logout.1.gz
+share/man/man1/cargo-metadata.1.gz
+share/man/man1/cargo-new.1.gz
+share/man/man1/cargo-owner.1.gz
+share/man/man1/cargo-package.1.gz
+share/man/man1/cargo-pkgid.1.gz
+share/man/man1/cargo-publish.1.gz
+share/man/man1/cargo-remove.1.gz
+share/man/man1/cargo-report.1.gz
+share/man/man1/cargo-run.1.gz
+share/man/man1/cargo-rustc.1.gz
+share/man/man1/cargo-rustdoc.1.gz
+share/man/man1/cargo-search.1.gz
+share/man/man1/cargo-test.1.gz
+share/man/man1/cargo-tree.1.gz
+share/man/man1/cargo-uninstall.1.gz
+share/man/man1/cargo-update.1.gz
+share/man/man1/cargo-vendor.1.gz
+share/man/man1/cargo-verify-project.1.gz
+share/man/man1/cargo-version.1.gz
+share/man/man1/cargo-yank.1.gz
+share/man/man1/cargo.1.gz
+share/man/man1/rustc.1.gz
+share/man/man1/rustdoc.1.gz
+%%DOCSDIR%%/COPYRIGHT
+%%DOCSDIR%%/LICENSE-APACHE
+%%DOCSDIR%%/LICENSE-MIT
+%%DOCSDIR%%/LICENSE-THIRD-PARTY
+%%DOCSDIR%%/README.md
+share/zsh/site-functions/_cargo