diff --git a/http.c b/http.c
index 042d149..cc005bf 100644
--- a/http.c
+++ b/http.c
@@ -93,13 +93,13 @@ void proxy_protocol()
 	{
 		if( args_info.verbose_flag )
 			message( "Tunneling to %s (remote proxy)\n", args_info.remproxy_arg );
-		sprintf( buf, "CONNECT %s HTTP/1.0\r\n", args_info.remproxy_arg );
+		snprintf( buf, 21+sizeof(args_info.remproxy_arg), "CONNECT %s HTTP/1.0\r\n", args_info.remproxy_arg );
 	}
 	else
 	{
 		if( args_info.verbose_flag )
 			message( "Tunneling to %s (destination)\n", args_info.dest_arg );
-		sprintf( buf, "CONNECT %s HTTP/1.0\r\n", args_info.dest_arg );
+		snprintf( buf, 21+sizeof(args_info.dest_arg), "CONNECT %s HTTP/1.0\r\n", args_info.dest_arg );
 	}
 	
 	if ( args_info.user_given && args_info.pass_given )
diff --git a/proxytunnel.c b/proxytunnel.c
index d6d47ae..bcda599 100755
--- a/proxytunnel.c
+++ b/proxytunnel.c
@@ -266,7 +266,7 @@ void do_daemon()
 		}
 
 		memcpy( &addr, &sa_cli.sin_addr.s_addr, 4 );
-		sprintf( (char *) buf, "%u.%u.%u.%u", addr[0], addr[1], addr[2], addr[3] );
+		snprintf( (char *) buf, 16, "%u.%u.%u.%u", addr[0], addr[1], addr[2], addr[3] );
 #ifdef CYGWIN
 		message( "Started tunnel pid=%d for connection from %s",
 		      pid, buf );