Log Message: Use the SUBST framework on the right files. FAQ now has the correct entries. Bump revision due to this.