>Will they ever be clever enough to repair themselves?

Perhaps, up to a point. More likely, they will self-monitor and alert 'someone' that they are not performing optimally and need to be serviced.

Humans will become 'Keepers of the Machine'. :D