diff --git a/lib/ecto/repo/supervisor.ex b/lib/ecto/repo/supervisor.ex
index 1be968d816..bda7a38cc1 100644
--- a/lib/ecto/repo/supervisor.ex
+++ b/lib/ecto/repo/supervisor.ex
@@ -111,7 +111,7 @@ defmodule Ecto.Repo.Supervisor do
       raise Ecto.InvalidURLError, url: url, message: "path should be a database name"
     end
 
-    destructure [username, password], info.userinfo && String.split(info.userinfo, ":")
+    destructure [username, password], info.userinfo && String.split(info.userinfo, ":", parts: 2)
     "/" <> database = info.path
 
     url_opts = [
diff --git a/test/ecto/repo/supervisor_test.exs b/test/ecto/repo/supervisor_test.exs
index 73f2f827a7..2a618ba33a 100644
--- a/test/ecto/repo/supervisor_test.exs
+++ b/test/ecto/repo/supervisor_test.exs
@@ -152,6 +152,12 @@ defmodule Ecto.Repo.SupervisorTest do
       refute Keyword.has_key?(url, :password)
     end
 
+    test "parses password containing colons" do
+      url = parse_url("ecto://user:top:secret@host:12345/mydb")
+      assert {:password, "top:secret"} in url
+      assert {:username, "user"} in url
+    end
+
     test "parses multiple query string options" do
       encoded_url = URI.encode("ecto://eric:it+й@host:12345/mydb?ssl=true&timeout=1515")
       url = parse_url(encoded_url)