make 2372 work, this also requires making target_dir work (VAM-kr), see patch