Metal-sulfur batteries, such as lithium-sulfur batteries, are prepared using one or more organosulfur species such as organic polysulfides and organic polythiolates as part of the liquid or gel electrolyte solution, as part of the cathode, as part of the anode (or used to treat the anode), and/or as part of a functionalized porous polymer providing an intermediate separator element.