Full GNU patch attached after description for easy review