diff --git a/src/proxy.c b/src/proxy.c
index 281bfa4..32715e2 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -239,7 +239,7 @@ void * proxychild(struct clientparam* param) {
  bufsize = BUFSIZE;
  anonymous = param->srv->singlepacket;
 for(;;){
- memset(buf, 0, BUFSIZE);
+ memset(buf, 0, bufsize);
  inbuf = 0;
 
 
@@ -494,7 +494,7 @@ for(;;){
 	}
 	inbuf += i;
 	if((bufsize - inbuf) < LINESIZE){
-		if (bufsize > 20000){
+		if (bufsize > (LINESIZE * 16)){
 			RETURN (516);
 		}
 		if(!(newbuf = myrealloc(buf, bufsize + BUFSIZE))){RETURN (21);}
diff --git a/src/version.h b/src/version.h
index a97b453..2c2453f 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,2 +1,2 @@
 #define VERSION "3proxy-0.8b-devel"
-#define BUILDDATE "150302205552"
+#define BUILDDATE "150302210600"