I'd say the copyright period could be a bit longer(40 years sounds about right), but it definitely needs to be fixed. None of this "life of the author" nonsense - as it is, somebody who published young and lived long enough could have his copyrights last multiple centuries.
Frankly, we just need to tear copyright down and rebuild it from first principles.