My choice of p-book management software is ReaderWare:
http://www.readerware.com/
It's really easy to add books, I can download my catalog onto my Palm, I can add my own custom fields, and it has powerful search/sort capabilities. I don't know how it handles e-books, though. Do e-books get ISBNs?