Index: src/libnr/nr-pixblock-pattern.cpp
===================================================================
--- src/libnr/nr-pixblock-pattern.cpp	(revision 16978)
+++ src/libnr/nr-pixblock-pattern.cpp	(working copy)
@@ -36,7 +36,7 @@
 	if (!noise) {
 		int i;
 		noise = g_new (unsigned char, NR_NOISE_SIZE);
-		for (i = 0; i < NR_NOISE_SIZE; i++) noise[i] = (rand () / (RAND_MAX >> 8)) & 0xff;
+		for (i = 0; i < NR_NOISE_SIZE; i++) noise[i] = g_random_int();
 	}
 
 	bpp = NR_PIXBLOCK_BPP (pb);
Index: src/libnr/testnr.cpp
===================================================================
--- src/libnr/testnr.cpp	(revision 16978)
+++ src/libnr/testnr.cpp	(working copy)
@@ -28,7 +28,7 @@
 static unsigned int
 rand_byte (void)
 {
-	return (int) (256.0 * rand () / (RAND_MAX + 1.0));
+	return g_random_int() & 255;
 }
 
 int
Index: src/jabber_whiteboard/session-manager.cpp
===================================================================
--- src/jabber_whiteboard/session-manager.cpp	(revision 16978)
+++ src/jabber_whiteboard/session-manager.cpp	(working copy)
@@ -262,7 +262,7 @@
     // Create a random session identifier
     char * randomString = (char*) malloc (size);
     for (int n=0; n<size; n++)
-        randomString[n]=rand()%26+'a';
+        randomString[n]=g_random_int() % 26 + 'a';
     randomString[size+1]='\0';
 
     return randomString;