After a two week channel blackout, Disney and DirecTV have a deal in principle.

The deal comes in time for college football games set to run on ESPN Saturday, as well as Sunday nights Emmy Awards and Monday Night Football the following day.

The agreed upon points including the opportunity to offer DirecTV customers genre-specific bundles, sports, entertainment, kids and family, which also include Disneys linear networks, as well as Disney+, Hulu and ESPN+. DirecTV will also have the right to distribute Disneys upcoming ESPN flagship streaming service to its customers for free upon launch. Disney+, Hulu, ESPN+ will be included in select DirecTV packages and also made available individually. DirecTV will also have continued carriage at market-based terms of Disneys entertainment, sports and news programming, including the ABC Owned Television Stations, the ESPN networks, the Disney-branded channels, Freeform, the FX networks and the National Geographic channels.

As a result of the deal, with the multi-year contract yet to be finalized, all of Disneys channels have been restored to DirecTV customers.

In a joint statement, the two companies said: Through this first-of-its-kind collaboration, DIRECTV and Disney are giving customers the ability to tailor their video experience through more flexible options. DIRECTV and Disney have a long-standing history of connecting consumers tothe best entertainment, and this agreement furthers that commitment by recognizing both the tremendous value of Disneys content and the evolving preferences of DIRECTVs customers. Wed like to thank all affected viewers for their patience and are pleased to restore Disneys entire portfolio of networks in time for college football and the Emmy Awards this weekend.

As with any carriage agreement, the devil will be in the details. By agreeing to the genre-based bundles, Disney is giving DirecTV its big ask, however, the penetration targets and prices are not known, and they could impact how the plans are received by consumers.

Similarly, the inclusion of Disneys streaming services not only provides added value to DirecTV customers, but serves Disneys bottom line by expanding the reach of those services. Disney notes that the deal sees the linear channels extended at market-based terms.

And unlike last years deal with Charter Spectrum, which saw a handful of channels like Freeform, Disney Junior and FXX cut from lineups, the DirecTV deal appears to keep the lineups intact.

After an extended dispute that saw Disney channels like ABC, ESPN, FX and Disney Channel pulled from DirecTV lineups, the media giant and satellite TV firm have a new carriage agreement, returning the channels to lineups.