diff --git a/ext/standard/crc32.c b/ext/standard/crc32.c
index ffac9ee144a..02bc54e623f 100644
--- a/ext/standard/crc32.c
+++ b/ext/standard/crc32.c
@@ -38,7 +38,7 @@ PHP_NAMED_FUNCTION(php_if_crc32)
 	for (len += nr; nr--; ++p) {
 	    CRC32(crc, *p);
 	}
-	RETVAL_LONG(~crc);
+	RETVAL_LONG(~ (long) crc);
 }
 /* }}} */
 
diff --git a/ext/standard/tests/strings/bug36306.phpt b/ext/standard/tests/strings/bug36306.phpt
new file mode 100644
index 00000000000..a4a02dd6584
--- /dev/null
+++ b/ext/standard/tests/strings/bug36306.phpt
@@ -0,0 +1,8 @@
+--TEST--
+Bug #36306 crc32() 64bit
+--FILE--
+<?php
+echo crc32("platform independant") . "\n";
+?>
+--EXPECT--
+-858128794