The bump map not working was my own stupid fault, I forgot to generate a UV map for my water surface : )

For the ripples-bump map I used the same grey-scale map as the one I used to make the waves (in Rhino), but I first made it nine times smaller and then tiled + rotated it.

http://www.renderosity.com/mod/gallery/media/folder_248/file_2474269.jpg

It is beginning to look a bit like I wanted it to, but it renders extremely slow and consumes an enormous amount of RAM, so there's a lot of room for improvement!

Cheers!

Erik