Oscar Pistorius has been selected to represent South Africa for the first time at an Olympic games.
Amputee Pistorius, who had already qualified for the Paralympics, will run in the 4x400m relay in London.
After hearing the news Pistorius, 25, wrote on Twitter: "Today is really on of the happiest days of my life! Will be in @London2012 for both the Olympic and Paralympic Games!
"Thank you to everyone that has made me the athlete I am! God, family and friends, my competitors and supporters! You have all had a hand!"
Pistorius will run with Willem de Beer, Ofentse Mogawane and Shaun de Jager in the event.
The South African 4x400m team won silver at the IAAF World Athletics Championships in Daegu last year.