diff --git a/programs/random/gen_random.c b/programs/random/gen_random.c
index 6a7aa3a..20246fe 100644
--- a/programs/random/gen_random.c
+++ b/programs/random/gen_random.c
@@ -44,7 +44,7 @@
 {
     FILE *f;
     time_t t;
-    int i, j, k;
+    int i, k;
     havege_state hs;
     unsigned char buf[1024];
 
@@ -66,8 +66,12 @@
 
     for( i = 0, k = 768; i < k; i++ )
     {
-        for( j = 0; j < (int) sizeof( buf ); j++ )
-            buf[j] = havege_rand( &hs );
+        if( havege_random( &hs, buf, sizeof( buf ) ) != 0 )
+        {
+            printf( "Failed to get random from source.\n" );
+            fclose( f );
+            return( 1 );
+        }
 
         fwrite( buf, sizeof( buf ), 1, f );