diff --git a/lib/libc/gen/arc4random.3 b/lib/libc/gen/arc4random.3
--- a/lib/libc/gen/arc4random.3
+++ b/lib/libc/gen/arc4random.3
@@ -30,7 +30,7 @@
 .\"
 .\" Manual page, using -mandoc macros
 .\"
-.Dd April 13, 2020
+.Dd November 18, 2024
 .Dt ARC4RANDOM 3
 .Os
 .Sh NAME
@@ -129,6 +129,17 @@
 .%O Document ID: 4027b5256e17b9796842e6d0f68b0b5e
 .%U http://cr.yp.to/papers.html#chacha
 .Re
+.Rs
+.%A Daniel Lemire
+.%T Fast Random Integer Generation in an Interval
+.%D January 2019
+.%J ACM Trans. Model. Comput. Simul.
+.%I Association for Computing Machinery
+.%C New York, NY, USA
+.%V vol. 29
+.%N no. 1
+.%P pp. 1\(en12
+.Re
 .Sh HISTORY
 These functions first appeared in
 .Ox 2.1 .
diff --git a/lib/libc/gen/arc4random_uniform.c b/lib/libc/gen/arc4random_uniform.c
--- a/lib/libc/gen/arc4random_uniform.c
+++ b/lib/libc/gen/arc4random_uniform.c
@@ -1,56 +1,35 @@
-/*	$OpenBSD: arc4random_uniform.c,v 1.3 2019/01/20 02:59:07 bcook Exp $	*/
-
-/*
- * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
+/*-
+ * Authored 2024 by Robert Clausecker <fuz@FreeBSD.org>
+ * based on a publication by Daniel Lemire.
  *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * Daniel Lemire, "Fast Random Integer Generation in an Interval",
+ * Association for Computing Machinery, ACM Trans. Model. Comput. Simul.,
+ * no. 1, vol. 29, pp. 1--12, New York, NY, USA, January 2019.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * Public domain.
  */
 
 #include <stdint.h>
 #include <stdlib.h>
 
-/*
- * Calculate a uniformly distributed random number less than upper_bound
- * avoiding "modulo bias".
- *
- * Uniformity is achieved by generating new random numbers until the one
- * returned is outside the range [0, 2**32 % upper_bound).  This
- * guarantees the selected random number will be inside
- * [2**32 % upper_bound, 2**32) which maps back to [0, upper_bound)
- * after reduction modulo upper_bound.
- */
 uint32_t
 arc4random_uniform(uint32_t upper_bound)
 {
-	uint32_t r, min;
+	uint64_t product;
+
+	if (upper_bound <= 1)
+		return (0);
 
-	if (upper_bound < 2)
-		return 0;
+	product = upper_bound * (uint64_t)arc4random();
 
-	/* 2**32 % x == (2**32 - x) % x */
-	min = -upper_bound % upper_bound;
+	if ((uint32_t)product < upper_bound) {
+		uint32_t threshold;
 
-	/*
-	 * This could theoretically loop forever but each retry has
-	 * p > 0.5 (worst case, usually far better) of selecting a
-	 * number inside the range we need, so it should rarely need
-	 * to re-roll.
-	 */
-	for (;;) {
-		r = arc4random();
-		if (r >= min)
-			break;
+		/* threshold = (2**32 - upper_bound) % upper_bound */
+		threshold = -upper_bound % upper_bound;
+		while ((uint32_t)product < threshold)
+			product = threshold * (uint64_t)arc4random();
 	}
 
-	return r % upper_bound;
+	return (product >> 32);
 }
diff --git a/lib/libc/tests/gen/arc4random_test.c b/lib/libc/tests/gen/arc4random_test.c
--- a/lib/libc/tests/gen/arc4random_test.c
+++ b/lib/libc/tests/gen/arc4random_test.c
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2011 David Schultz
+ * Copyright (c) 2024 Robert Clausecker <fuz@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,6 +30,7 @@
 #include <sys/wait.h>
 #include <errno.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -77,10 +79,34 @@
 	    "sequences are the same");
 }
 
+/*
+ * Test whether arc4random_uniform() returns a number below the given threshold.
+ * Test with various thresholds.
+ */
+ATF_TC_WITHOUT_HEAD(test_arc4random_uniform);
+ATF_TC_BODY(test_arc4random_uniform, tc)
+{
+	size_t i, j;
+	static const uint32_t thresholds[] = {
+		1, 2, 3, 4, 5, 10, 100, 1000,
+		INT32_MAX, (uint32_t)INT32_MAX + 1,
+		UINT32_MAX - 1000000000, UINT32_MAX - 1000000, UINT32_MAX - 1, 0
+	};
+
+	for (i = 0; thresholds[i] != 0; i++)
+		for (j = 0; j < 10000; j++)
+			ATF_CHECK(arc4random_uniform(thresholds[i]) < thresholds[i]);
+
+	/* for a threshold of zero, just check that we get zero every time */
+	for (j = 0; j < 1000; j++)
+		ATF_CHECK_EQ(0, arc4random_uniform(0));
+}
+
 ATF_TP_ADD_TCS(tp)
 {
 
 	ATF_TP_ADD_TC(tp, test_arc4random);
+	ATF_TP_ADD_TC(tp, test_arc4random_uniform);
 
 	return (atf_no_error());
 }