removed patch 0002 since it seems now included upstream
adjusted patch 0004 to follow upstream