A portable weapon comprises a non-lethal portion and a lethal portion. The lethal portion may comprise a rifle, and the non-lethal portion may comprise a millimeter-wave directed energy weapon. The non-lethal portion may comprise a kit to add non-lethal capability to a lethal weapon. The non-lethal portion may comprise an output antenna to generate a high-power millimeter-wave initial wavefront, a main reflector, and a sub-reflector to reflect the initial wavefront to the main reflector. The main reflector may direct the reflected wavefront in a bore-sighted direction toward a target. The wavefront directed by the main reflector may have a power density selected to deliver a non-lethal deterring effect on the target. In some embodiments, the non-lethal portion may include a replaceable energy-storage module.