As recent production facilities are usually operated with unmanned material-handling system, the development of an efficient schedule with deadlock avoidance becomes a critical problem. Related researches on deadlock avoidance usually focus on real-time control of manufacturing system using deadlock avoidance policy. But little off-line optimization of deadlock-free schedule has been reported. This paper presents an optimization method for deadlock-free scheduling for Job-Shop system with no buffer. The deadlock-free schedule is acquired by the procedure that generates candidate lists of waiting operations, and applies a deadlock avoidance policy. To verify the proposed approach, simulation resultsare presented for minimizing makespan in three problem types. According to the simulation results the effect of each deadlock avoidance policy is dependent on the type of problem. When the proposed LOEM (Last Operation Exclusion Method) is employed, computing time for optimization as well as makespan is reduced.