Git workflow: forking a project and maintaing a local modified copy, but keep up to date

I'm trying to figure out the best workflow for maintaining a local copy of a github-hosted project (moodle) with customizations, while maintaining the ability to keep our copy up-to-date. Tell me if what I'm thinking about doing is completely insane: 1. Fork the project (github.com/moodle/moodle --> github.com/sfu/moodle) 2. Create an upstream remote (git remote add upstream git://github.com/moodle/moodle.git && git fetch upstream) 2. Create a branch for our custom development and keep master pristine. 3. When we want to update our fork, update the pristine branch (git checkout master && git fetch upstream && git merge upstream/master) 4. Merge master into our customizations branch (git checkout custom && git merge master) Does this make sense?