diff --git a/stdlib/2.7/__builtin__.pyi b/stdlib/2.7/__builtin__.pyi
index a93555dddc61..b9ba65f6ce75 100644
--- a/stdlib/2.7/__builtin__.pyi
+++ b/stdlib/2.7/__builtin__.pyi
@@ -24,7 +24,6 @@ _T4 = TypeVar('_T4')
 
 staticmethod = object()  # Special, only valid as a decorator.
 classmethod = object()  # Special, only valid as a decorator.
-property = object()
 
 class object:
     __doc__ = ...  # type: str
@@ -639,6 +638,17 @@ class module:
     __file__ = ...  # type: str
     __dict__ = ...  # type: Dict[unicode, Any]
 
+class property:
+    def __init__(self, fget: Callable[[Any], Any] = None,
+                 fset: Callable[[Any, Any], None] = None,
+                 fdel: Callable[[Any], None] = None, doc: str = None) -> None: ...
+    def getter(self, fget: Callable[[Any], Any]) -> property: ...
+    def setter(self, fset: Callable[[Any, Any], None]) -> property: ...
+    def deleter(self, fdel: Callable[[Any], None]) -> property: ...
+    def __get__(self, obj: Any, type: type=None) -> Any: ...
+    def __set__(self, obj: Any, value: Any) -> None: ...
+    def __del__(self, obj: Any) -> None: ...
+
 long = int
 bytes = str
 
diff --git a/stdlib/3/builtins.pyi b/stdlib/3/builtins.pyi
index f7e8562e152d..b0217bb936e5 100644
--- a/stdlib/3/builtins.pyi
+++ b/stdlib/3/builtins.pyi
@@ -23,7 +23,6 @@ _T4 = TypeVar('_T4')
 
 staticmethod = object() # Only valid as a decorator.
 classmethod = object() # Only valid as a decorator.
-property = object()
 
 class object:
     __doc__ = ...  # type: str
@@ -616,6 +615,17 @@ class module:
     __file__ = ...  # type: str
     __dict__ = ...  # type: Dict[str, Any]
 
+class property:
+    def __init__(self, fget: Callable[[Any], Any] = None,
+                 fset: Callable[[Any, Any], None] = None,
+                 fdel: Callable[[Any], None] = None, doc: str = None) -> None: ...
+    def getter(self, fget: Callable[[Any], Any]) -> property: ...
+    def setter(self, fset: Callable[[Any, Any], None]) -> property: ...
+    def deleter(self, fdel: Callable[[Any], None]) -> property: ...
+    def __get__(self, obj: Any, type: type=None) -> Any: ...
+    def __set__(self, obj: Any, value: Any) -> None: ...
+    def __del__(self, obj: Any) -> None: ...
+
 NotImplemented = ...  # type: Any
 
 def abs(n: SupportsAbs[_T]) -> _T: ...