diff --git a/stepmania/src/CryptManager.cpp b/stepmania/src/CryptManager.cpp
index ff9ec48272..8afaa629fa 100644
--- a/stepmania/src/CryptManager.cpp
+++ b/stepmania/src/CryptManager.cpp
@@ -20,13 +20,6 @@ static const CString PUBLIC_KEY_PATH = "Data/public.rsa";
 static const int KEY_LENGTH = 1024;
 #define MAX_SIGNATURE_SIZE_BYTES 1024	// 1 KB
 
-#ifndef OS_RNG_AVAILABLE
-/* To ease porting, if there is no AutoSeededRandomPool, use an insecure, unseeded pool. */
-#include "crypto51/randpool.h"
-#include "crypto51/rng.h"
-#define AutoSeededRandomPool RandomPool
-#endif
-
 CryptManager*	CRYPTMAN	= NULL;	// global and accessable from anywhere in our program
 
 CryptManager::CryptManager()
@@ -56,7 +49,7 @@ void CryptManager::GenerateRSAKey( unsigned int keyLength, CString privFilename,
 
 	try
 	{
-		AutoSeededRandomPool rng;
+		NonblockingRng rng;
 
 		RSASSA_PKCS1v15_SHA_Signer priv(rng, keyLength);
 		RageFileSink privFile(privFilename);
@@ -90,7 +83,7 @@ void CryptManager::SignFileToFile( CString sPath, CString sSignatureFile )
 	try {
 		RageFileSource privFile(sPrivFilename, true);
 		RSASSA_PKCS1v15_SHA_Signer priv(privFile);
-		AutoSeededRandomPool rng;
+		NonblockingRng rng;
 
 		RageFileSource f(sMessageFilename, true, new SignerFilter(rng, priv, new RageFileSink(sSignatureFile)));
 	} catch( const CryptoPP::Exception &s ) {