What is the difference between a muppet and a puppet?

Question:

Does the former have to be made by the Jim Henson company?

Best Answer - Chosen by Asker: a muppet is a hybrid marionette / puppet, hence the name muppet