diff --git a/include/curl/curl.h b/include/curl/curl.h
index f3593f424a522e8d4b3180b644df408f6e334a8a..b856fa956c051e8229a0ada8b3faaafc0a4bfc01 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -979,7 +979,7 @@ time_t curl_getdate(const char *p, const time_t *now);
 typedef enum {
   CURLINFO_NONE, /* first, never use this */
   CURLINFO_EFFECTIVE_URL    = CURLINFO_STRING + 1,
-  CURLINFO_HTTP_CODE        = CURLINFO_LONG   + 2,
+  CURLINFO_RESPONSE_CODE    = CURLINFO_LONG   + 2,
   CURLINFO_TOTAL_TIME       = CURLINFO_DOUBLE + 3,
   CURLINFO_NAMELOOKUP_TIME  = CURLINFO_DOUBLE + 4,
   CURLINFO_CONNECT_TIME     = CURLINFO_DOUBLE + 5,
@@ -1005,6 +1005,10 @@ typedef enum {
   CURLINFO_LASTONE          = 23
 } CURLINFO;
 
+/* CURLINFO_RESPONSE_CODE is the new name for the option previously known as
+   CURLINFO_HTTP_CODE */
+#define CURLINFO_HTTP_CODE CURLINFO_RESPONSE_CODE
+
 typedef enum {
   CURLCLOSEPOLICY_NONE, /* first, never use this */
 
diff --git a/lib/getinfo.c b/lib/getinfo.c
index a4b0fa602f0ec6b576e4dec7fc13ba42f1f772a7..29da0dc3c94e81c30d891ad1ce9c7eddd516d2c6 100644
--- a/lib/getinfo.c
+++ b/lib/getinfo.c
@@ -103,7 +103,7 @@ CURLcode Curl_getinfo(struct SessionHandle *data, CURLINFO info, ...)
   case CURLINFO_EFFECTIVE_URL:
     *param_charp = data->change.url?data->change.url:(char *)"";
     break;
-  case CURLINFO_HTTP_CODE:
+  case CURLINFO_RESPONSE_CODE:
     *param_longp = data->info.httpcode;
     break;
   case CURLINFO_HTTP_CONNECTCODE:
diff --git a/src/writeenv.c b/src/writeenv.c
index fefac5a62853ea353ee70a9a72aa811361f10af5..8932b5073e7a49baceb74819c1f45a673e3424ac 100644
--- a/src/writeenv.c
+++ b/src/writeenv.c
@@ -44,7 +44,7 @@ struct
 } variables[14] =
 {
   {"curl_url_effective", CURLINFO_EFFECTIVE_URL, writeenv_STRING},
-  {"curl_http_code", CURLINFO_HTTP_CODE, writeenv_LONG},
+  {"curl_http_code", CURLINFO_RESPONSE_CODE, writeenv_LONG},
   {"curl_time_total", CURLINFO_TOTAL_TIME, writeenv_DOUBLE},
   {"curl_time_namelookup", CURLINFO_NAMELOOKUP_TIME, writeenv_DOUBLE},
   {"curl_time_connect", CURLINFO_CONNECT_TIME, writeenv_DOUBLE},
diff --git a/src/writeout.c b/src/writeout.c
index 5a762899854ab806d656cf878101e9bfe9354863..6c86489c3fdb388eb90b6f4b3282c0f470b830e9 100644
--- a/src/writeout.c
+++ b/src/writeout.c
@@ -118,7 +118,7 @@ void ourWriteOut(CURL *curl, char *writeinfo)
                 break;
               case VAR_HTTP_CODE:
                 if(CURLE_OK ==
-                   curl_easy_getinfo(curl, CURLINFO_HTTP_CODE, &longinfo))
+                   curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &longinfo))
                   fprintf(stream, "%03d", longinfo);
                 break;
               case VAR_HEADER_SIZE: