diff --git a/ext/curl/curl.c b/ext/curl/curl.c
index 8cee3737861..b88334217a6 100644
--- a/ext/curl/curl.c
+++ b/ext/curl/curl.c
@@ -797,17 +797,16 @@ PHP_FUNCTION(curl_setopt)
 				
 				postval = Z_STRVAL_PP(current);
 				if (*postval == '@') {
-					error = curl_formadd(&first, 
-										 &last, 
+					error = curl_formadd(&first, &last, 
 										 CURLFORM_COPYNAME, string_key,
-										 CURLFORM_NAMELENGTH, string_key_len,
-					                     CURLFORM_FILE, ++postval, 
+										 CURLFORM_NAMELENGTH, string_key_len - 1,
+										 CURLFORM_FILE, ++postval, 
 										 CURLFORM_END);
 				}
 				else {
 					error = curl_formadd(&first, &last, 
 										 CURLFORM_COPYNAME, string_key,
-										 CURLFORM_NAMELENGTH, string_key_len,
+										 CURLFORM_NAMELENGTH, string_key_len - 1,
 										 CURLFORM_PTRCONTENTS, postval, 
 										 CURLFORM_CONTENTSLENGTH, Z_STRLEN_PP(current),
 										 CURLFORM_END);