I would suggest modifying the upstream source. There are already situations where this is desirable or even necessary (for example when upstream contains both main and non-free sources.)