The attached patch has been tested by creating
arm64, mipsel & amd64 chroots and the amd64
one has been actually run.

-- 
Vincent Legoll