  We prove that every Banach space admitting a Gateaux smooth norm and
containing a complemented copy of $\ell_1$ has an equivalent renorming which is
simultaneously G\^ateaux smooth and octahedral. This is a partial solution to a
problem from the early nineties.
