Catch up with the changes incorporated in XEmacs package.