diff --git a/stdlib/2/compileall.pyi b/stdlib/2/compileall.pyi
index 103d62227633..ca64eb523fae 100644
--- a/stdlib/2/compileall.pyi
+++ b/stdlib/2/compileall.pyi
@@ -1,7 +1,10 @@
 # Stubs for compileall (Python 2)
-#
-# NOTE: This dynamically typed stub was automatically generated by stubgen.
 
-def compile_dir(dir, maxlevels=..., ddir=..., force=..., rx=..., quiet=...): ...
-def compile_file(fullname, ddir=..., force=..., rx=..., quiet=...): ...
-def compile_path(skip_curdir=..., maxlevels=..., force=..., quiet=...): ...
+from typing import Optional, Pattern, Union
+
+_Path = Union[str, bytes]
+
+# fx can be any object with a 'search' method; once we have Protocols we can change the type
+def compile_dir(dir: _Path, maxlevels: int = ..., ddir: _Path = ..., force: bool = ..., rx: Optional[Pattern] = ..., quiet: int = ...) -> None: ...
+def compile_file(fullname: _Path, ddir: _Path = ..., force: bool = ..., rx: Optional[Pattern] = ..., quiet: int = ...) -> None: ...
+def compile_path(skip_curdir: bool = ..., maxlevels: int = ..., force: bool = ..., quiet: int = ...) -> None: ...
diff --git a/stdlib/3/compileall.pyi b/stdlib/3/compileall.pyi
new file mode 100644
index 000000000000..4722923bdd09
--- /dev/null
+++ b/stdlib/3/compileall.pyi
@@ -0,0 +1,18 @@
+# Stubs for compileall (Python 3)
+
+import os
+import sys
+from typing import Optional, Union, Pattern
+
+if sys.version_info < (3, 6):
+    _Path = Union[str, bytes]
+else:
+    _Path = Union[str, bytes, os.PathLike]
+
+# fx can be any object with a 'search' method; once we have Protocols we can change the type
+if sys.version_info < (3, 5):
+    def compile_dir(dir: _Path, maxlevels: int = ..., ddir: _Path = ..., force: bool = ..., rx: Optional[Pattern] = ..., quiet: int = ..., legacy: bool = ..., optimize: int = ...) -> None: ...
+else:
+    def compile_dir(dir: _Path, maxlevels: int = ..., ddir: _Path = ..., force: bool = ..., rx: Optional[Pattern] = ..., quiet: int = ..., legacy: bool = ..., optimize: int = ..., workers: int = ...) -> None: ...
+def compile_file(fullname: _Path, ddir: _Path = ..., force: bool = ..., rx: Optional[Pattern] = ..., quiet: int = ..., legacy: bool = ..., optimize: int = ...) -> None: ...
+def compile_path(skip_curdir: bool = ..., maxlevels: int = ..., force: bool = ..., quiet: int = ..., legacy: bool = ..., optimize: int = ...) -> None: ...