Ubuntu 11.04. Wrong keyboard keeps reappearing as default

When I installed Ubuntu 11.04 on my laptop there was a problem with selecting a keyboard other than USA. If I selected any other keyboard the installation hung for minutes, so eventually I accepted the USA keyboard thinking I would change it later. Everything installed so I went to System Settings and chose Keyboard in the Control Center and under the Layout tab I removed the USA keyboard and added a German one.

However after every reboot the USA keyboard was back and worse still it was the default, so I had to keep switching back to German. Removing the US keyboard only resulted in it reappearing after a reboot.
Eventually I found the answer. Go to /etc/default/keyboard and change the line XKBLAYOUT="us" to your desired keyboard and re-boot.

XKBMODEL="pc105"
#XKBLAYOUT="us"
XKBLAYOUT="de"
XKBVARIANT=""
XKBOPTIONS=""