Techniques are described for enhancements to Protocol Independent Multicast (PIM) to enable a last hop router (LHR) to perform source discovery and directly build or join a source tree. According to the techniques of this disclosure, the LHR builds a communication channel with a rendezvous point (RP) router and requests source information for at least one multicast group for which the LHR has interested receivers. The RP responds to the request by looking into a register database maintained by the RP and sending source information indicating at least one source that is actively providing traffic for the at least one multicast group. Based on the response, the LHR initiates a (S,G) PIM Join message toward the at least one source for the at least one multicast group to directly build or join at least one source tree.