The Whiskey class was the NATO reporting name of a class of diesel-electric patrol submarines that were built in the Soviet Union. The Soviet designation of this class was Project 613.

Construction of the class spanned from 1949 to 1958 and, as finalized, the boats displaced 1045 tons when surfaced and 1342 s submerged with dimensions that included a length of 76 meters, a beam of 6,3 meters, and a draught of 5 meters. A standard crew complement numbered 55 personnel.

Propulsion was conventional and involved a combination diesel-electric arrangement in which the diesel units carried the boat during surface running and the electric motors powered the boat underwater. This required the boat to surface to charge its battery packs and expel any built-up CO2 gas. Surfaced speeds reached 18 knots and submerged speeds fell to 13 knots. Operational range was out to 8580 nautical miles when surfaced and 353 miles when submerged - enough provisions were on hand to supply the crew on 30 day long patrols. As designed, the Whiskey-class was primarily intended for coastal patrolling though its role would expand throughout its service tenure.

In terms of armament, the Whiskey-class continued established attack submarine tradition by being fitted with 6 x 533mm (21") torpedo tubes arranged in four bow (forward facing) mountings and two stern (rear facing) mountings. This allowed the frontal four tubes to be used to attack forward targets and the pairing at the rear to engage trailing targets. Twelve torpedo reloads were carried though this could be substituted with twenty-two naval mines as needed.

Between 1949 and 1958 a total of 215 submarines of this type were commissioned into the Soviet Navy. The Whiskey-class was sold to various Soviet-aligned nations including Albania, Bulgaria, China, Egypt, Indonesia, North Korea, and Poland.

Some Whiskey submarines were converted to guided missile submarines, with the capability to fire one to four SS-N-3 Shaddock cruise missiles. In 1956, the first prototype was ready. It was a regular Whiskey class modified with a launch tube aft of the sail containing a single SS-N-3c. This vessel was known in the West as Whiskey Single Cylinder. Between 1958 and 1960, six additional Whiskey-class submarines were converted to carry guided missiles. These boats had two missile tubes behind the sail, and were known in the west as the Whiskey Twin Cylinder, and Project 644 boats by the Soviets.

Submarine S-158 laid down on 23 December 1952 at Krasnoe Sormovo Shipyard named after A.A. Zhdanov, Gorky (yard No.504) by Project 613, launched on 16 May 1953, commissioned on 31 December 1953 and was assigned to the Caspian Flotilia.

From 14 October 1958 to 31 August 1961, S-158 was overhauled at Krasnoe Sormovo Shipyard named after A.A. Zhdanov, Gorky, and converted to Project 644 guided missile submarine, by having launch tubes for two SS-N-3 Shaddock anti-ship missiles fitted externally.

On 30 October 1961 the submarine was assigned to the Northern Fleet.

On 29 September 1969 the submarine transferred to the Black Sea Fleet.

On 09 July 1982 the submarine S-158 was decommissioned, excluded from the lists of the Black Sea Fleet and scrapped in Inkerman.