China's president, Xi Jinping, is in Germany on the third leg of his European tour.
In a speech on China's role in the world, he pledged not to provoke trouble in the South China Sea.
Business deals were the focus of Xi's discussion with the German chancellor, Angela Merkel.
But Merkel also raised the issues of human rights abuses and the free Tibet campaign.
Al Jazeera's Tim Friend reports from Berlin.