Join the FSF

Taxonomy upgrade extras: