diff --git a/clamav-devel/NEWS b/clamav-devel/NEWS
index dd169ef29..49864b5cd 100644
--- a/clamav-devel/NEWS
+++ b/clamav-devel/NEWS
@@ -2,6 +2,16 @@ Note: This README/NEWS file refers to the source tarball. Some things described
 here may not be available in binary packages.
 --
 
+0.80rc4
+-------
+
+Improvements in this release include better JPEG exploit verification,
+faster base64 decoding, support for GNU tar files, updated on-access scanner,
+and others.
+
+--
+The ClamAV team (http://www.clamav.net/team.html)
+
 0.80rc3
 -------
 
diff --git a/clamav-devel/README b/clamav-devel/README
index dd169ef29..49864b5cd 100644
--- a/clamav-devel/README
+++ b/clamav-devel/README
@@ -2,6 +2,16 @@ Note: This README/NEWS file refers to the source tarball. Some things described
 here may not be available in binary packages.
 --
 
+0.80rc4
+-------
+
+Improvements in this release include better JPEG exploit verification,
+faster base64 decoding, support for GNU tar files, updated on-access scanner,
+and others.
+
+--
+The ClamAV team (http://www.clamav.net/team.html)
+
 0.80rc3
 -------
 
diff --git a/clamav-devel/libclamav/others.c b/clamav-devel/libclamav/others.c
index 4926b78da..c7ff07fc7 100644
--- a/clamav-devel/libclamav/others.c
+++ b/clamav-devel/libclamav/others.c
@@ -249,8 +249,8 @@ void *cli_malloc(size_t size)
 	void *alloc;
 
 
-    if(size > MAX_ALLOCATION) {
-	cli_errmsg("Attempt to allocate more than %d bytes. Please report to bugs@clamav.net\n", MAX_ALLOCATION);
+    if(size > MAX_ALLOCATION || size < 0) {
+	cli_errmsg("Attempt to allocate %d bytes. Please report to bugs@clamav.net\n", size);
 	return NULL;
     }
 
@@ -268,8 +268,9 @@ void *cli_calloc(size_t nmemb, size_t size)
 {
 	void *alloc;
 
-    if(size > MAX_ALLOCATION) {
-	cli_errmsg("Attempt to allocate more than %d bytes. Please report to bugs@clamav.net\n", MAX_ALLOCATION);
+
+    if(size > MAX_ALLOCATION || size < 0) {
+	cli_errmsg("Attempt to allocate %d bytes. Please report to bugs@clamav.net\n", size);
 	return NULL;
     }
 
@@ -287,10 +288,6 @@ void *cli_realloc(void *ptr, size_t size)
 {
 	void *alloc;
 
-    if(size > MAX_ALLOCATION) {
-	cli_errmsg("Attempt to allocate more than %d bytes. Please report to bugs@clamav.net\n", MAX_ALLOCATION);
-	return NULL;
-    }
 
     alloc = realloc(ptr, size);