Jonathan Hill, 30, was arrested on Saturday after three girls accused him of exposing himself.
Marin County sheriff's deputies said they found child pornography on his cell phone and inside his home.
That is when the FBI got involved.
The child pornography charges were added Thursday and Hill is now in federal custody.