diff --git a/oggenc/audio.c b/oggenc/audio.c
index fc5ac517f35f3052cdde3e99e98ea63a66a05edb..d9cedb6cde7b7ed9eb9d3f2170aa3d0c055b57e1 100644
--- a/oggenc/audio.c
+++ b/oggenc/audio.c
@@ -445,8 +445,8 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen)
 			}
 			else
 			{
-				opt->total_samples_per_channel = (ftell(in) - pos)/(format.channels*2);
-				wav->totalsamples = len/(format.channels*2);
+				opt->total_samples_per_channel = (ftell(in) - pos)/(format.channels*samplesize);
+				wav->totalsamples = len/(format.channels*samplesize);
 				fseek(in,pos, SEEK_SET);
 			}
 		}