Properly merge in Non-GNU extension