diff --git a/src/tool_operate.c b/src/tool_operate.c
index 99996e142..ab29c00b3 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -1297,7 +1297,10 @@ static CURLcode operate_do(struct GlobalConfig *global,
         if(config->content_disposition
            && (urlnode->flags & GETOUT_USEREMOTE)
            && (checkprefix("http://", this_url) ||
-               checkprefix("https://", this_url)))
+               checkprefix("https://", this_url) ||
+               (!strstr(this_url, "://") &&
+                (!config->proto_default ||
+                 checkprefix("http", config->proto_default)))))
           hdrcbdata.honor_cd_filename = TRUE;
         else
           hdrcbdata.honor_cd_filename = FALSE;
diff --git a/tests/data/test1312 b/tests/data/test1312
index 92144015a..bed492c16 100644
--- a/tests/data/test1312
+++ b/tests/data/test1312
@@ -40,7 +40,7 @@ HTTP GET with -J, Content-Disposition and ; in filename
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1312 -J -O
+%HOSTIP:%HTTPPORT/1312 -J -O
 </command>
 </client>