In current practice, optimal placement of deep-brain stimulators (DBSs) used to treat movement disorders in patients with Parkinson's disease and essential tremor is an iterative procedure. A target is chosen preoperatively based on anatomical landmarks identified on magnetic resonance images. This point is used as an initial position that is refined intraoperatively using both microelectrode recordings and macrostimulation. In this paper, we report on our current progress toward developing a system for the computer-assisted preoperative selection of target points and for the intraoperative adjustment of these points. The system consists of a deformable atlas of optimal target points that can be used to select automatically the preoperative target, of an electrophysiological atlas, and of an intraoperative interface. Results we have obtained show that automatic prediction of target points is an achievable goal. Our results also indicate that electrophysiological information could be used to resolve structures not visible in anatomic images, thus improving both preoperative and intraoperative guidance. Our intraoperative system has reached the stage of a working prototype and we compare targeting accuracy as well as the number of paths needed to reach the targets with our system and with the method in current clinical use.