diff --git a/stdlib/2/socket.pyi b/stdlib/2/socket.pyi
index 77525aa78..83ac7493f 100644
--- a/stdlib/2/socket.pyi
+++ b/stdlib/2/socket.pyi
@@ -337,7 +337,8 @@ def create_connection(address: Tuple[str, int],
 # the 5th tuple item is an address
 def getaddrinfo(
         host: Optional[str], port: Union[str, int, None], family: int = ...,
-        socktype: int = ..., proto: int = ..., flags: int = ...) -> List[Tuple[int, int, int, str, Union[Tuple[str, int], Tuple[str, int, int, int]]]]:
+        socktype: int = ..., proto: int = ...,
+        flags: int = ...) -> List[Tuple[int, int, int, str, Union[Tuple[str, int], Tuple[str, int, int, int]]]]:
     ...
 
 def getfqdn(name: str = ...) -> str: ...
diff --git a/stdlib/3/socket.pyi b/stdlib/3/socket.pyi
index e0c21b08e..f6c727898 100644
--- a/stdlib/3/socket.pyi
+++ b/stdlib/3/socket.pyi
@@ -332,8 +332,9 @@ def create_connection(address: Tuple[str, int],
 
 # the 5th tuple item is an address
 def getaddrinfo(
-        host: str, port: int, family: int = ..., type: int = ..., proto: int = ...,
-        flags: int = ...) -> List[Tuple[int, int, int, str, tuple]]:
+        host: Optional[str], port: Union[str, int, None], family: int = ...,
+        socktype: int = ..., proto: int = ...,
+        flags: int = ...) -> List[Tuple[int, int, int, str, Union[Tuple[str, int], Tuple[str, int, int, int]]]]:
     ...
 
 def getfqdn(name: str = ...) -> str: ...