Initial patch for FreeBSD v10+