HTC and Apple have ended their dispute over mobile phone patents after more than two years of warring.
The organisations started their fight in March 2010 and have now signed a ten-year agreement which extends to current and future patents which are held by either company.
Peter Chou, head of HTC, said that the deal will allow the Taiwanese firm to concentrate on "innovation instead of litigation".
Apple's Tim Cook also added that the company can now get back to staying "laser focused" on improving future products.
The battle between HTC and Apple began over two years ago when the iPhone manufacturer sued its rival after claiming that some of its technology had been infringed.
In 2011, Apple also won an order from the US International Trade Commission which banned HTC from bringing its phones to the country which broke patent rules.
Since then, similar wars have broken out between Apple and other competitors like Samsung and Google.
Posted by Claire Marshall