Ok, just noticed that a forked repository of mine wasn’t actually automatically updated by Github. Luckily enough, http://help.github.com/forking/ made the process pretty painless:

Next time I’ll just repeat git fetch upstream git merge upstream/master git push origin master