It's both. The first series was completed early on in the manga's release, so only the first 6 episodes or so are true the manga. Anything after that was made up.

This new one does a remake of those six episodes and packs it into two episodes. From what I understand, anything after that is brand new to anime but is true to the manga.

This is what I have read off of forums though, nothing that was officially said by the production companies.