A new type of HNC calculation is proposed in which the variation of the solvation energies with salt and solvent concentration is taken into account. This is done by means of a self-consistent calculation of the distance dependent permittivity function around a central ion. The theory yields ion-ion as well as ion-solvent correlation functions and concentration dependent permittivities. In contrast to HNC calculations with a completely discrete-solvent model, the program requires only a small amount of computing power.