diff --git a/CHANGES b/CHANGES
index 66b24f71979cc69e8e79e9c817f12c4e3d7eb684..7b4b5c09db88bd1133c09b1266ad0f4ee4acc8c2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@
 
                                   Changelog
 
+Daniel Fandrich (31 Mar 2009)
+- Properly return an error code in curl_easy_recv (reported by Jim Freeman).
+
 Daniel Stenberg (18 Mar 2009)
 - Kamil Dudka brought a patch that enables 6 additional crypto algorithms when
   NSS is used. These ciphers were added in NSS 3.4 and require to be enabled
diff --git a/lib/easy.c b/lib/easy.c
index dc6c59366cf5ef7c96880b686df3735339f09609..a5819349507eedcb14d0f74159f7471e13758cbe 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -1095,8 +1095,8 @@ CURLcode curl_easy_recv(CURL *curl, void *buffer, size_t buflen, size_t *n)
   if(ret1 == -1)
     return CURLE_AGAIN;
 
-  if(n1 == -1)
-    return CURLE_RECV_ERROR;
+  if(ret1 != CURLE_OK)
+    return ret1;
 
   *n = (size_t)n1;