diff --git a/duchain/expressionvisitor.cpp b/duchain/expressionvisitor.cpp
--- a/duchain/expressionvisitor.cpp
+++ b/duchain/expressionvisitor.cpp
@@ -97,15 +97,21 @@
     // Like, for B.C where B is an instance of foo, find a property of foo called C.
     DUChainReadLocker lock;
     auto attribute = Helper::accessAttribute(v.lastType(), node->attribute->value, topContext());
-
-    if ( auto resolved = Helper::resolveAliasDeclaration(attribute) ) {
-        encounter(attribute->abstractType(), DeclarationPointer(attribute));
-        setLastIsAlias(dynamic_cast<AliasDeclaration*>(attribute) ||
-                        resolved->isFunctionDeclaration() ||
-                        dynamic_cast<ClassDeclaration*>(resolved));
-    } else {
+    auto resolved = Helper::resolveAliasDeclaration(attribute);
+    if ( ! resolved ) {
         encounterUnknown();
+        return;
+    }
+    auto function = dynamic_cast<FunctionDeclaration*>(resolved);
+    if ( function && function->type<FunctionType>() &&
+          Helper::findDecoratorByName(function, QLatin1String("property")) ) {
+        encounter(function->type<FunctionType>()->returnType(), DeclarationPointer(function));
+        return;
     }
+    encounter(attribute->abstractType(), DeclarationPointer(attribute));
+    setLastIsAlias(function ||
+                    dynamic_cast<AliasDeclaration*>(attribute) ||
+                    dynamic_cast<ClassDeclaration*>(resolved) );
 }
 
 void ExpressionVisitor::visitCall(CallAst* node)
diff --git a/duchain/tests/pyduchaintest.cpp b/duchain/tests/pyduchaintest.cpp
--- a/duchain/tests/pyduchaintest.cpp
+++ b/duchain/tests/pyduchaintest.cpp
@@ -806,11 +806,11 @@
     
     QFETCH(QString, code);
     QFETCH(QString, expectedType);
-    
+
     ReferencedTopDUContext ctx = parse(code.toUtf8());
     QVERIFY(ctx);
     QVERIFY(m_ast);
-    
+
     DUChainReadLocker lock(DUChain::lock());
     TypeTestVisitor* visitor = new TypeTestVisitor();
     visitor->ctx = TopDUContextPointer(ctx.data());
@@ -823,6 +823,8 @@
     QEXPECT_FAIL("return_builtin_iterator", "fake builtin iter()", Continue);
     QEXPECT_FAIL("parent_constructor_arg_type", "Not enough passes?", Continue);
     QEXPECT_FAIL("init_class_no_decl", "aliasing info lost", Continue);
+    QEXPECT_FAIL("property_wrong", "visitCall uses declaration if no type", Continue);
+    QEXPECT_FAIL("property_setter", "very basic property support", Continue);
     QCOMPARE(visitor->found, true);
 }
 
@@ -1105,11 +1107,25 @@
                                     "         return k\n"
                                     "f = Foo.foo()\n"
                                     "checkme = f\n" << "Foo";
+    QTest::newRow("property_getter") << "class Foo:\n"
+                                        "    @property\n"
+                                        "    def bar(self): return 35\n"
+                                        "checkme = Foo().bar" << "int";
+    QTest::newRow("property_wrong") << "class Foo:\n"
+                                       "    @property\n"
+                                       "    def bar(self): return True\n"
+                                       "checkme = Foo().bar()" << "mixed";
+    QTest::newRow("property_setter") << "class Foo:\n"
+                                        "    @property\n"
+                                        "    def bar(self): return 35\n"
+                                        "    @bar.setter\n"
+                                        "    def bar(self, value): return 18.3\n" // Return should be ignored
+                                        "checkme = Foo().bar" << "int";
 
     QTest::newRow("tuple_listof") << "l = [(1, 2), (3, 4)]\ncheckme = l[1][0]" << "int";
 
     QTest::newRow("getitem") << "class c:\n def __getitem__(self, slice): return 3.14\na = c()\ncheckme = a[2]" << "float";
-    
+
     QTest::newRow("constructor_type_deduction") << "class myclass:\n"
                                                    "\tdef __init__(self, param): self.foo=param\n"
                                                    "checkme = myclass(3).foo" << "int";