diff --git a/ChangeLog b/ChangeLog
index b56e87846..44f4bc61f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-08	Paul Giblock <drfaygo/at/gmail/dot/com>
+    
+    * plugins/papu/gb_abu/Blip_Buffer.cpp:
+    Fix PAPU for 64bit machines
+
 2008-09-08	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* CMakeLists.txt:
diff --git a/plugins/papu/gb_apu/Blip_Buffer.cpp b/plugins/papu/gb_apu/Blip_Buffer.cpp
index cde60d6f6..7a1445719 100644
--- a/plugins/papu/gb_apu/Blip_Buffer.cpp
+++ b/plugins/papu/gb_apu/Blip_Buffer.cpp
@@ -46,7 +46,7 @@ void Blip_Buffer::clear( bool entire_buffer )
 
 blargg_err_t Blip_Buffer::set_sample_rate( long new_rate, int msec )
 {
-	unsigned new_size = (ULONG_MAX >> BLIP_BUFFER_ACCURACY) + 1 - widest_impulse_ - 64;
+	unsigned new_size = (0xFFFFFFFF >> BLIP_BUFFER_ACCURACY) + 1 - widest_impulse_ - 64;
 	if ( msec != blip_default_length )
 	{
 		size_t s = (new_rate * (msec + 1) + 999) / 1000;