diff --git a/CHANGES.md b/CHANGES.md
index 4b7c3021fd..f84b617f3f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -25,6 +25,7 @@ Core Grammars:
 - enh(json) add json5 support [Kerry Shetline][]
 - fix(css) `unicode-range` parsing, issue #4253 [Kerry Shetline][]
 - fix(csharp) Support digit separators [te-ing][]
+- enh(python) add support for methods and properties [fibbo][]
 
 Documentation:
 
@@ -53,6 +54,7 @@ CONTRIBUTORS
 [Thomas Gorissen]: https://github.com/serrynaimo
 [te-ing]: https://github.com/te-ing
 [Anthony Martin]: https://github.com/anthony-c-martin
+[fibbo]: https://github.com/fibbo
 
 
 ## Version 11.11.1
diff --git a/src/languages/python.js b/src/languages/python.js
index 2604889790..3e3b53785c 100644
--- a/src/languages/python.js
+++ b/src/languages/python.js
@@ -383,6 +383,39 @@ export default function(hljs) {
         relevance: 0
       },
       { match: /\bor\b/, scope: "keyword" },
+      // Method calls with parentheses
+      {
+        match: [
+          /\./,
+          IDENT_RE,
+          /(?=\s*\()/
+        ],
+        scope: {
+          2: "title.function.method"
+        }
+      },
+      // Chained method calls
+      {
+        match: [
+          /\./,
+          IDENT_RE,
+          /(?=\s*\.\s*\w)/
+        ],
+        scope: {
+          2: "title.function.method"
+        }
+      },
+      {
+        match: [
+          /(?<!(?:import|from)\s+[\w.]*)/,  // Negative lookbehind for import context
+          /\./,                             // Literal dot
+          IDENT_RE,                         // Property name
+          /(?!\s*[\(\[])/                   // Not followed by ( or [
+        ],
+        scope: {
+          3: "property"
+        }
+      },
       STRING,
       COMMENT_TYPE,
       hljs.HASH_COMMENT_MODE,
diff --git a/test/markup/python-repl/sample.expect.txt b/test/markup/python-repl/sample.expect.txt
index 66bf554a24..b4ff939350 100644
--- a/test/markup/python-repl/sample.expect.txt
+++ b/test/markup/python-repl/sample.expect.txt
@@ -3,9 +3,9 @@
 &quot;foo = 42&quot;
 <span class="hljs-meta prompt_">&gt;&gt;&gt;</span> <span class="language-python"><span class="hljs-built_in">print</span>(v)</span>
 foo = 42
-<span class="hljs-meta prompt_">&gt;&gt;&gt;</span> <span class="language-python"><span class="hljs-built_in">print</span>(<span class="hljs-built_in">repr</span>(v).rstrip(<span class="hljs-string">&#x27;&quot;&#x27;</span>))</span>
+<span class="hljs-meta prompt_">&gt;&gt;&gt;</span> <span class="language-python"><span class="hljs-built_in">print</span>(<span class="hljs-built_in">repr</span>(v).<span class="hljs-title function_ method__">rstrip</span>(<span class="hljs-string">&#x27;&quot;&#x27;</span>))</span>
 &quot;foo = 42
-<span class="hljs-meta prompt_">&gt;&gt;&gt;</span> <span class="language-python"><span class="hljs-built_in">print</span>(<span class="hljs-built_in">repr</span>(v).lstrip(<span class="hljs-string">&#x27;&quot;&#x27;</span>))</span>
+<span class="hljs-meta prompt_">&gt;&gt;&gt;</span> <span class="language-python"><span class="hljs-built_in">print</span>(<span class="hljs-built_in">repr</span>(v).<span class="hljs-title function_ method__">lstrip</span>(<span class="hljs-string">&#x27;&quot;&#x27;</span>))</span>
 foo = 42&quot;
 
 <span class="hljs-meta prompt_">&gt;&gt;&gt;</span> <span class="language-python"><span class="hljs-string">&quot;&quot;&quot;</span></span>
diff --git a/test/markup/python/class_self.expect.txt b/test/markup/python/class_self.expect.txt
index db39ede4a9..08ceac87f0 100644
--- a/test/markup/python/class_self.expect.txt
+++ b/test/markup/python/class_self.expect.txt
@@ -1,6 +1,6 @@
 <span class="hljs-keyword">class</span> <span class="hljs-title class_">SelfTest</span>:
     <span class="hljs-keyword">def</span> <span class="hljs-title function_">__init__</span>(<span class="hljs-params">self</span>):
-        <span class="hljs-variable language_">self</span>.text = <span class="hljs-literal">True</span>
+        <span class="hljs-variable language_">self</span>.<span class="hljs-property">text</span> = <span class="hljs-literal">True</span>
 
     <span class="hljs-keyword">def</span> <span class="hljs-title function_">method</span>(<span class="hljs-params">self</span>):
         <span class="hljs-keyword">pass</span>
diff --git a/test/markup/python/function-header-comments.expect.txt b/test/markup/python/function-header-comments.expect.txt
index 35041289d8..9215af8fa2 100644
--- a/test/markup/python/function-header-comments.expect.txt
+++ b/test/markup/python/function-header-comments.expect.txt
@@ -4,7 +4,7 @@
     <span class="hljs-keyword">pass</span>
 
 
-<span class="hljs-keyword">class</span> <span class="hljs-title class_">Foo</span>(collections.namedtuple(<span class="hljs-string">&#x27;Test&#x27;</span>), (
+<span class="hljs-keyword">class</span> <span class="hljs-title class_">Foo</span>(collections.<span class="hljs-title function_ method__">namedtuple</span>(<span class="hljs-string">&#x27;Test&#x27;</span>), (
     <span class="hljs-string">&#x27;name&#x27;</span>, <span class="hljs-comment"># comment</span>
 )):
     <span class="hljs-keyword">pass</span>
diff --git a/test/markup/python/keywords.expect.txt b/test/markup/python/keywords.expect.txt
index f2227af2f5..b5bb7fb80f 100644
--- a/test/markup/python/keywords.expect.txt
+++ b/test/markup/python/keywords.expect.txt
@@ -1,14 +1,18 @@
+<span class="hljs-keyword">from</span> base.derive <span class="hljs-keyword">import</span> test
+<span class="hljs-keyword">import</span> base.test
+
 <span class="hljs-keyword">class</span> <span class="hljs-title class_">Shorty</span>(<span class="hljs-title class_ inherited__">dict</span>):
     <span class="hljs-keyword">def</span> <span class="hljs-title function_">len</span>(<span class="hljs-params">self</span>):
         <span class="hljs-keyword">return</span> <span class="hljs-literal">NotImplemented</span>
 
 x = Shorty()
+x.<span class="hljs-title function_ method__">len</span>()
 <span class="hljs-built_in">len</span>(x)
 
 <span class="hljs-keyword">if</span> <span class="hljs-literal">__debug__</span>:
     sys = <span class="hljs-built_in">__import__</span>(<span class="hljs-string">&#x27;sys&#x27;</span>)
 
-<span class="hljs-keyword">for</span> _ <span class="hljs-keyword">in</span> sys.path:
+<span class="hljs-keyword">for</span> _ <span class="hljs-keyword">in</span> sys.<span class="hljs-property">path</span>:
     <span class="hljs-built_in">print</span>(_)
 
 <span class="hljs-built_in">exec</span>(<span class="hljs-number">123</span>)
diff --git a/test/markup/python/keywords.txt b/test/markup/python/keywords.txt
index 30e3d0a180..8b32aec233 100644
--- a/test/markup/python/keywords.txt
+++ b/test/markup/python/keywords.txt
@@ -1,8 +1,12 @@
+from base.derive import test
+import base.test
+
 class Shorty(dict):
     def len(self):
         return NotImplemented
 
 x = Shorty()
+x.len()
 len(x)
 
 if __debug__:
diff --git a/test/markup/python/matrix-multiplication.expect.txt b/test/markup/python/matrix-multiplication.expect.txt
index 91ad4b9261..6a5f334e4c 100644
--- a/test/markup/python/matrix-multiplication.expect.txt
+++ b/test/markup/python/matrix-multiplication.expect.txt
@@ -3,5 +3,5 @@
 
 <span class="hljs-meta">    @decorator</span>
     <span class="hljs-keyword">def</span> <span class="hljs-title function_">f</span>(<span class="hljs-params">self, H, V, beta, r</span>):
-        S = (H @ beta - r).T @ inv(H @ V @ H.T) @ (H @ beta - r)
+        S = (H @ beta - r).<span class="hljs-property">T</span> @ inv(H @ V @ H.<span class="hljs-property">T</span>) @ (H @ beta - r)
         <span class="hljs-keyword">return</span> S
diff --git a/test/markup/python/numbers.expect.txt b/test/markup/python/numbers.expect.txt
index 725eb354f7..65530608ea 100644
--- a/test/markup/python/numbers.expect.txt
+++ b/test/markup/python/numbers.expect.txt
@@ -29,7 +29,7 @@
 
 
 <span class="hljs-comment"># expressions containing numeric literals</span>
-<span class="hljs-number">0.</span>.__str__, <span class="hljs-number">1e1</span>.__str__, fn(<span class="hljs-number">.5</span>)
+<span class="hljs-number">0.</span>.<span class="hljs-property">__str__</span>, <span class="hljs-number">1e1</span>.<span class="hljs-property">__str__</span>, fn(<span class="hljs-number">.5</span>)
 <span class="hljs-number">0</span><span class="hljs-keyword">is</span> <span class="hljs-number">0</span>, <span class="hljs-number">0l</span><span class="hljs-keyword">is</span> <span class="hljs-number">0</span>
 <span class="hljs-number">0_0_0</span><span class="hljs-keyword">is</span> <span class="hljs-number">0</span>, <span class="hljs-number">0_0_0l</span><span class="hljs-keyword">is</span> <span class="hljs-number">0</span>
 <span class="hljs-number">0b0</span><span class="hljs-keyword">is</span> <span class="hljs-number">0</span>, <span class="hljs-number">0b0l</span><span class="hljs-keyword">is</span> <span class="hljs-number">0</span>
@@ -50,7 +50,7 @@
 <span class="hljs-number">0_0_0j</span><span class="hljs-keyword">is</span> <span class="hljs-number">0</span>, <span class="hljs-number">0_0_9j</span><span class="hljs-keyword">is</span> <span class="hljs-number">0</span>
 
 <span class="hljs-comment"># expressions not containing numeric literals</span>
-x0.j
+x0.<span class="hljs-property">j</span>
 
 <span class="hljs-comment"># invalid pseudo-numeric expressions</span>
 1__0