Keyboard issue in upgrading to Ubuntu 8.10 on a MacBook Pro

I recently upgraded to Ubuntu 8.10 in hopes that it would solve some issues I've been having with Ruby's rake. However this gave me a new issue. I keep the useless tiny enter key and right apple key mapped to the right and middle mouse buttons respectively. I do this with two entries in a file called ~/.xmodmap. However with Ibex these codes changed. Luckily there is "xev" to detect them. After the change it is:

keycode 134 = Pointer_Button2
keycode 104 = Pointer_Button3