Patch by Pravin Satpute <psatpute@redhat.com>.