One or more implementations can include methods, systems and computer readable media for client location discovery. In some implementations, the method can include receiving, at an access point, a location discovery request message from a client and sending a request from the access point to a location server requesting location information for the client, when a location server is available. The method can also include receiving location information from the location server, when a location server is available and providing the access point location as location information, when a location server is not available. The method can further include sending the location information as a response to the client.