try this page, it has plenty of CAD proggies to do just that. Go down to Electrical CAD systems to find the stuff specialized for electronics. Of course, you can still use other CAD proggies to do the diagrams as well. Most of these are free.
http://www.freebyte.com/cad/cad.htm