diff --git a/examples/Makefile.in b/examples/Makefile.in
index a7bf5f82bc14d921a6935ddb219627178b421487..7c7d62dec26827e8cdb0466917a4515213897a8e 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -13,7 +13,7 @@ PRE_LDFLAGS = -L..
 OPENSSL_LIBFLAGS = @OPENSSL_LIBFLAGS@
 RSA_TARGETS = rsa-keygen$(EXEEXT) rsa-sign$(EXEEXT) \
 	      rsa-verify$(EXEEXT) rsa-encrypt$(EXEEXT) rsa-decrypt$(EXEEXT)
-TARGETS = nettle-benchmark$(EXEEXT) eratosthenes$(EXEEXT) @IF_HOGWEED@ $(RSA_TARGETS) next-prime$(EXEEXT)
+TARGETS = nettle-benchmark$(EXEEXT) eratosthenes$(EXEEXT) @IF_HOGWEED@ $(RSA_TARGETS) next-prime$(EXEEXT) random-prime$(EXEEXT)
 SOURCES = nettle-benchmark.c eratosthenes.c next-prime.c nettle-openssl.c \
 	io.c read_rsa_key.c getopt.c getopt1.c \
 	rsa-encrypt.c rsa-decrypt.c rsa-keygen.c rsa-sign.c rsa-verify.c
@@ -35,6 +35,10 @@ next-prime$(EXEEXT): next-prime.$(OBJEXT) $(GETOPT_OBJS) ../libhogweed.a
 	$(LINK) next-prime.$(OBJEXT) $(GETOPT_OBJS) \
 	-lhogweed -lnettle $(LIBS) -o next-prime$(EXEEXT)
 
+random-prime$(EXEEXT): random-prime.$(OBJEXT) $(GETOPT_OBJS) ../libhogweed.a
+	$(LINK) random-prime.$(OBJEXT) io.$(OBJEXT) $(GETOPT_OBJS) \
+	-lhogweed -lnettle $(LIBS) -o random-prime$(EXEEXT)
+
 rsa-keygen$(EXEEXT): rsa-keygen.$(OBJEXT) $(GETOPT_OBJS)
 	$(LINK) rsa-keygen.$(OBJEXT) io.$(OBJEXT) $(GETOPT_OBJS) \
 	-lhogweed -lnettle $(LIBS) -o rsa-keygen$(EXEEXT)
diff --git a/examples/random-prime.c b/examples/random-prime.c
new file mode 100644
index 0000000000000000000000000000000000000000..fe31e12a4dbab69af2d830031eb11163203c67dd
--- /dev/null
+++ b/examples/random-prime.c
@@ -0,0 +1,142 @@
+/* random-prime.c
+ *
+ * Command line tool for prime generation.
+ *
+ */
+ 
+/* nettle, low-level cryptographics library
+ *
+ * Copyright (C) 2010 Niels Möller
+ *  
+ * The nettle library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ * 
+ * The nettle library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+ * License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with the nettle library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA 02111-1307, USA.
+ */
+
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+
+#include "bignum.h"
+#include "yarrow.h"
+
+#include "io.h"
+
+#include "getopt.h"
+
+static void
+usage(void)
+{
+  fprintf(stderr, "Usage: random-prime [OPTIONS] bits\n\n"
+	  "Options:\n"
+	  "      --help         Display this message.\n"
+	  "  -v, --verbose      Display timing information.\n"
+	  "  -r, --random FILE  Random data to use for seeding.\n");
+}
+
+int
+main(int argc, char **argv)
+{
+  long bits;
+  mpz_t p;
+  struct yarrow256_ctx yarrow;
+
+  int verbose = 0;  
+  const char *random_file = NULL;
+
+  int c;
+  char *arg_end;
+
+  clock_t start;
+  clock_t end;
+  
+  static const struct option options[] =
+    {
+      /* Name, args, flag, val */
+      { "help", no_argument, NULL, '?' },
+      { "verbose", no_argument, NULL, 'v' },
+      { "random", required_argument, NULL, 'r' },
+      { NULL, 0, NULL, 0}
+    };
+
+  while ( (c = getopt_long(argc, argv, "v?r:", options, NULL)) != -1)
+    switch (c)
+      {
+      case 'v':
+	verbose = 1;
+	break;
+      case 'r':
+	random_file = optarg;
+	break;
+      case '?':
+	usage();
+	return EXIT_FAILURE;
+      default:
+	abort();
+      }
+
+  argc -= optind;
+  argv += optind;
+
+  if (argc != 1)
+    {
+      usage();
+      return EXIT_FAILURE;
+    }
+
+  bits = strtol(argv[0], &arg_end, 0);
+  if (*arg_end || bits < 0)
+    {
+      fprintf(stderr, "Invalid number.\n");
+      return EXIT_FAILURE;
+    }
+
+  if (bits < 6)
+    {
+      fprintf(stderr, "Bitsize must be at least 6.\n");
+      return EXIT_FAILURE;
+    }
+
+  /* NOTE: No sources */
+  yarrow256_init(&yarrow, 0, NULL);
+
+  /* Read some data to seed the generator */
+  if (!simple_random(&yarrow, random_file))
+    {
+      werror("Initialization of randomness generator failed.\n");
+      return EXIT_FAILURE;
+    }
+  
+  mpz_init(p);
+
+  start = clock();
+
+  nettle_random_prime(p, bits,
+		      &yarrow, (nettle_random_func *) yarrow256_random);
+
+  end = clock();
+
+  mpz_out_str(stdout, 10, p);
+  printf("\n");
+
+  if (verbose)
+    fprintf(stderr, "time: %.3g s\n",
+	    (double)(end - start) / CLOCKS_PER_SEC);
+
+  return EXIT_SUCCESS;
+}