diff --git a/stdlib/3/importlib/__init__.pyi b/stdlib/3/importlib/__init__.pyi
index 5ca648805..1191ed77d 100644
--- a/stdlib/3/importlib/__init__.pyi
+++ b/stdlib/3/importlib/__init__.pyi
@@ -2,22 +2,17 @@ import sys
 import types
 from typing import Any, Mapping, Optional, Sequence
 
-
 def __import__(name: str, globals: Mapping[str, Any] = None,
                locals: Mapping[str, Any] = None, fromlist: Sequence[str] = (),
                level: int = 0) -> types.ModuleType: ...
 
-
 def import_module(name: str, package: str = None) -> types.ModuleType: ...
 
-
 if sys.version_info >= (3, 3):
     # Optionally returns a loader, but importlib.abc doesn't have a stub file.
     def find_loader(name: str, path: str = None): ...
 
-
     def invalidate_caches() -> None: ...
 
-
 if sys.version_info >= (3, 4):
     def reload(module: types.ModuleType) -> types.ModuleType: ...
diff --git a/stdlib/3/importlib/abc.pyi b/stdlib/3/importlib/abc.pyi
new file mode 100644
index 000000000..83f39c480
--- /dev/null
+++ b/stdlib/3/importlib/abc.pyi
@@ -0,0 +1,87 @@
+import abc
+import sys
+import types
+from typing import Mapping, Optional, Sequence, Union
+
+_Path = Union[bytes, str]
+
+class Loader(metaclass=abc.ABCMeta):
+    def load_module(self, fullname: str) -> types.ModuleType: ...
+    if sys.version_info >= (3, 3):
+        def module_repr(self, module: types.ModuleType) -> str: ...
+    if sys.version_info >= (3, 4):
+        def create_module(self, spec: Any) -> Optional[types.ModuleType]: ...
+        # Not defined on the actual class for backwards-compatibility reasons,
+        # but expected in new code.
+        def exec_module(self, module: types.ModuleType) -> None: ...
+
+class Finder(metaclass=abc.ABCMeta): ...
+    # Technically this class defines the following method, but its subclasses
+    # in this module violate its signature. Since this class is deprecated, it's
+    # easier to simply ignore that this method exists.
+    #@abc.abstractmethod
+    #def find_module(self, fullname: str,
+    #                path: Sequence[_Path] = None) -> Optional[Loader]: ...
+
+class ResourceLoader(Loader):
+    @abc.abstractmethod
+    def get_data(self, path: _Path) -> bytes: ...
+
+class InspectLoader(Loader):
+    def is_package(self, fullname: str) -> bool: ...
+    def get_code(self, fullname: str) -> Optional[types.CodeType]: ...
+    def load_module(self, fullname: str) -> types.ModuleType: ...
+    @abc.abstractmethod
+    def get_source(self, fullname: str) -> Optional[str]: ...
+    if sys.version_info >= (3, 4):
+        def exec_module(self, module: types.ModuleType) -> None: ...
+    if sys.version_info == (3, 4):
+        def source_to_code(self, data: Union[bytes, str],
+                           path: str = '<string>') -> types.CodeType: ...
+    elif sys.version_info >= (3, 5):
+        @staticmethod
+        def source_to_code(self, data: Union[bytes, str],
+                           path: str = '<string>') -> types.CodeType: ...
+
+class ExecutionLoader(InspectLoader):
+    @abc.abstractmethod
+    def get_filename(self, fullname: str) -> _Path: ...
+    def get_code(self, fullname: str) -> Optional[types.CodeType]: ...
+
+class SourceLoader(ResourceLoader, ExecutionLoader):
+    def path_mtime(self, path: _Path) -> Union[int, float]: ...
+    def set_data(self, path: _Path, data: bytes) -> None: ...
+    def get_source(self, fullname: str) -> Optional[str]: ...
+    if sys.version_info >= (3, 3):
+        def path_stats(self, path: _Path) -> Mapping[str, Any]: ...
+
+
+if sys.version_info >= (3, 3):
+    class MetaPathFinder(Finder):
+        def find_module(self, fullname: str,
+                        path: Optional[Sequence[_Path]]) -> Optional[Loader]:
+            ...
+        def invalidate_caches(self) -> None: ...
+        if sys.version_info >= (3, 4):
+            # Not defined on the actual class, but expected to exist.
+            def findAny(fullname: str, path: Optional[Sequence[_Path]],
+                          target: types.ModuleType = None) -> Optional[Any]:
+                ...
+
+    class PathEntryFinder(Finder):
+        def find_module(self, fullname: str) -> Optional[Loader]: ...
+        def find_loader(self, fullname: str
+                       ) -> Tuple[Optional[Loader], Sequence[_Path]]: ...
+        def invalidate_caches(self) -> None: ...
+        if sys.version_info >= (3, 4):
+            # Not defined on the actual class, but expected to exist.
+            def findAny(fullname: str,
+                          target: types.ModuleType = None) -> Optional[Any]:
+                ...
+
+    class FileLoader(ResourceLoader, ExecutionLoader):
+        name = ... # type: str
+        path = ... # type: _Path
+        def __init__(self, fullname: str, path: _Path) -> None: ...
+        def get_data(self, path: _Path) -> bytes: ...
+        def get_filename(self, fullname: str) -> _Path: ...
diff --git a/stdlib/3/types.pyi b/stdlib/3/types.pyi
index 1da6369f9..ad120b733 100644
--- a/stdlib/3/types.pyi
+++ b/stdlib/3/types.pyi
@@ -3,6 +3,8 @@
 
 # TODO parts of this should be conditional on version
 
+import importlib.abc
+import sys
 from typing import (
     Any, Callable, Dict, Generic, Iterator, Mapping, Optional, Tuple, TypeVar,
     Union, overload
@@ -107,8 +109,14 @@ BuiltinMethodType = BuiltinFunctionType
 
 class ModuleType:
     __name__ = ... # type: str
-    __file__ = ... # type: str
-    def __init__(self, name: str, doc: Any) -> None: ...
+    __doc__ = ... # type: Optional[str]
+    if sys.version_info >= (3, 4):
+        __loader__ = ... # type: Optional[importlib.abc.Loader]
+        __package__ = ... # type: Optional[str]
+        # Should be Optional[ModuleSpec], but importlib.machinery has no stub
+        # yet.
+        __spec__ = ... # type: Optional[Any]
+    def __init__(self, name: str, doc: str) -> None: ...
 
 class TracebackType:
     tb_frame = ... # type: FrameType