There is also a BMW museum as well as Schloß Oberschleißheim (Wikipedia) just next to Munich (can be reached by the S-Bahn). Next to the castle is - AFAIK - a part of the Deutsche Museum.

There is also a very detailed page of the Tourist Office Munich.