diff --git a/stdlib/3/pickle.pyi b/stdlib/3/pickle.pyi
index b3dcd07a9..6d8f51dff 100644
--- a/stdlib/3/pickle.pyi
+++ b/stdlib/3/pickle.pyi
@@ -1,12 +1,67 @@
 # Stubs for pickle
 
-# NOTE: These are incomplete!
+from typing import Any, BinaryIO, Union, Tuple, Callable, Optional, Iterator
+# Imports used in type comments only.
+from typing import Mapping  # noqa
+
+HIGHEST_PROTOCOL = ...  # type: int
+DEFAULT_PROTOCOL = ...  # type: int
+
+
+def dump(obj: Any, file: BinaryIO, protocol: int = None, *,
+         fix_imports: bool = ...) -> None: ...
 
-from typing import Any, IO
 
 def dumps(obj: Any, protocol: int = ..., *,
           fix_imports: bool = ...) -> bytes: ...
-def loads(p: bytes, *, fix_imports: bool = ...,
+
+
+def loads(bytes_object: bytes, *, fix_imports: bool = ...,
           encoding: str = ..., errors: str = ...) -> Any: ...
-def load(file: IO[bytes], *, fix_imports: bool = ..., encoding: str = ...,
+
+
+def load(file: BinaryIO, *, fix_imports: bool = ..., encoding: str = ...,
          errors: str = ...) -> Any: ...
+
+
+class PickleError(Exception):
+    pass
+
+
+class PicklingError(PickleError):
+    pass
+
+
+class UnpicklingError(PickleError):
+    pass
+
+
+_reducedtype = Union[str,
+                     Tuple[Callable[..., Any], Tuple],
+                     Tuple[Callable[..., Any], Tuple, Any],
+                     Tuple[Callable[..., Any], Tuple, Any,
+                           Optional[Iterator]],
+                     Tuple[Callable[..., Any], Tuple, Any,
+                           Optional[Iterator], Optional[Iterator]]]
+
+
+class Pickler:
+    dispatch_table = ...  # type: Mapping[type, Callable[[Any], _reducedtype]]
+
+    def __init__(self, file: BinaryIO, protocol: int = None, *,
+                 fix_imports: bool = ...) -> None: ...
+
+    def dump(self, obj: Any) -> None: ...
+
+    def persistent_id(self, obj: Any) -> Any: ...
+
+
+class Unpickler:
+    def __init__(self, file: BinaryIO, *, fix_imports: bool = ...,
+                 encoding: str = ..., errors: str = ...) -> None: ...
+
+    def load(self) -> Any: ...
+
+    def persistent_load(self, pid: Any) -> Any: ...
+
+    def find_class(self, module: str, name: str) -> Any: ...