National Geographic Style Manual has moved to
Hyphenate all compounds with these suffixes:
bird-watcher
China-watcher
walrus-watching