I would say that the deduction would be limited to the Uniformed Services of the United States.  

However, if your client was retired USAF and retired Civil Service.  I would say he would be eligible for $2500 deduction on the Civil Service retirement and a $3500 on his military retirement.