diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ffc95fac..e7e595227 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,12 @@ BUG FIXES:
   (`rpc.grpc_max_open_connections`). Check out [Running In
   Production](https://tendermint.readthedocs.io/en/master/running-in-production.html)
   guide if you want to increase them.
+  
+## 0.21.2
+
+IMPROVEMENT
+
+- [rpc/client] Supports https and wss now
 
 ## 0.21.0
 
diff --git a/rpc/lib/client/http_client.go b/rpc/lib/client/http_client.go
index e26d8f274..bd440289b 100644
--- a/rpc/lib/client/http_client.go
+++ b/rpc/lib/client/http_client.go
@@ -17,6 +17,14 @@ import (
 	types "github.com/tendermint/tendermint/rpc/lib/types"
 )
 
+const (
+	protoHTTP  = "http"
+	protoHTTPS = "https"
+	protoWSS   = "wss"
+	protoWS    = "ws"
+	protoTCP   = "tcp"
+)
+
 // HTTPClient is a common interface for JSONRPCClient and URIClient.
 type HTTPClient interface {
 	Call(method string, params map[string]interface{}, result interface{}) (interface{}, error)
@@ -25,29 +33,37 @@ type HTTPClient interface {
 }
 
 // TODO: Deprecate support for IP:PORT or /path/to/socket
-func makeHTTPDialer(remoteAddr string) (string, func(string, string) (net.Conn, error)) {
+func makeHTTPDialer(remoteAddr string) (string, string, func(string, string) (net.Conn, error)) {
+	// protocol to use for http operations, to support both http and https
+	clientProtocol := protoHTTP
+
 	parts := strings.SplitN(remoteAddr, "://", 2)
 	var protocol, address string
 	if len(parts) == 1 {
 		// default to tcp if nothing specified
-		protocol, address = "tcp", remoteAddr
+		protocol, address = protoTCP, remoteAddr
 	} else if len(parts) == 2 {
 		protocol, address = parts[0], parts[1]
 	} else {
 		// return a invalid message
 		msg := fmt.Sprintf("Invalid addr: %s", remoteAddr)
-		return msg, func(_ string, _ string) (net.Conn, error) {
+		return clientProtocol, msg, func(_ string, _ string) (net.Conn, error) {
 			return nil, errors.New(msg)
 		}
 	}
-	// accept http as an alias for tcp
-	if protocol == "http" {
-		protocol = "tcp"
+
+	// accept http as an alias for tcp and set the client protocol
+	switch protocol {
+	case protoHTTP, protoHTTPS:
+		clientProtocol = protocol
+		protocol = protoTCP
+	case protoWS, protoWSS:
+		clientProtocol = protocol
 	}
 
 	// replace / with . for http requests (kvstore domain)
 	trimmedAddress := strings.Replace(address, "/", ".", -1)
-	return trimmedAddress, func(proto, addr string) (net.Conn, error) {
+	return clientProtocol, trimmedAddress, func(proto, addr string) (net.Conn, error) {
 		return net.Dial(protocol, address)
 	}
 }
@@ -55,8 +71,8 @@ func makeHTTPDialer(remoteAddr string) (string, func(string, string) (net.Conn,
 // We overwrite the http.Client.Dial so we can do http over tcp or unix.
 // remoteAddr should be fully featured (eg. with tcp:// or unix://)
 func makeHTTPClient(remoteAddr string) (string, *http.Client) {
-	address, dialer := makeHTTPDialer(remoteAddr)
-	return "http://" + address, &http.Client{
+	protocol, address, dialer := makeHTTPDialer(remoteAddr)
+	return protocol + "://" + address, &http.Client{
 		Transport: &http.Transport{
 			Dial: dialer,
 		},
diff --git a/rpc/lib/client/ws_client.go b/rpc/lib/client/ws_client.go
index a95ce17d2..6928dff36 100644
--- a/rpc/lib/client/ws_client.go
+++ b/rpc/lib/client/ws_client.go
@@ -70,13 +70,21 @@ type WSClient struct {
 
 	// Send pings to server with this period. Must be less than readWait. If 0, no pings will be sent.
 	pingPeriod time.Duration
+
+	// Support both ws and wss protocols
+	protocol string
 }
 
 // NewWSClient returns a new client. See the commentary on the func(*WSClient)
 // functions for a detailed description of how to configure ping period and
 // pong wait time. The endpoint argument must begin with a `/`.
 func NewWSClient(remoteAddr, endpoint string, options ...func(*WSClient)) *WSClient {
-	addr, dialer := makeHTTPDialer(remoteAddr)
+	protocol, addr, dialer := makeHTTPDialer(remoteAddr)
+	// default to ws protocol, unless wss is explicitly specified
+	if protocol != "wss" {
+		protocol = "ws"
+	}
+
 	c := &WSClient{
 		cdc:                  amino.NewCodec(),
 		Address:              addr,
@@ -88,6 +96,7 @@ func NewWSClient(remoteAddr, endpoint string, options ...func(*WSClient)) *WSCli
 		readWait:             defaultReadWait,
 		writeWait:            defaultWriteWait,
 		pingPeriod:           defaultPingPeriod,
+		protocol:             protocol,
 	}
 	c.BaseService = *cmn.NewBaseService(nil, "WSClient", c)
 	for _, option := range options {
@@ -242,7 +251,7 @@ func (c *WSClient) dial() error {
 		Proxy:   http.ProxyFromEnvironment,
 	}
 	rHeader := http.Header{}
-	conn, _, err := dialer.Dial("ws://"+c.Address+c.Endpoint, rHeader)
+	conn, _, err := dialer.Dial(c.protocol+"://"+c.Address+c.Endpoint, rHeader)
 	if err != nil {
 		return err
 	}