diff --git a/powerline/segments/common.py b/powerline/segments/common.py
index df4c1a58..611c154e 100644
--- a/powerline/segments/common.py
+++ b/powerline/segments/common.py
@@ -7,7 +7,7 @@ import sys
 
 from datetime import datetime
 import socket
-from multiprocessing import cpu_count
+from multiprocessing import cpu_count as _cpu_count
 
 from powerline.lib import add_divider_highlight_group
 from powerline.lib.url import urllib_read, urllib_urlencode
@@ -18,6 +18,7 @@ from powerline.lib.humanize_bytes import humanize_bytes
 from powerline.theme import requires_segment_info
 from collections import namedtuple
 
+cpu_count = None
 
 @requires_segment_info
 def hostname(pl, segment_info, only_if_ssh=False, exclude_domain=False):
@@ -485,7 +486,7 @@ Also uses ``weather_conditions_{condition}`` for all weather conditions supporte
 ''')
 
 
-def system_load(pl, format='{avg:.1f}', threshold_good=1, threshold_bad=2):
+def system_load(pl, format='{avg:.1f}', threshold_good=1, threshold_bad=2, track_cpu_count=False):
 	'''Return system load average.
 
 	Highlights using ``system_load_good``, ``system_load_bad`` and
@@ -504,6 +505,9 @@ def system_load(pl, format='{avg:.1f}', threshold_good=1, threshold_bad=2):
 		indicates relative position in this interval:
 		(``100 * (cur-good) / (bad-good)``).
 		Note: both parameters are checked against normalized load averages.
+	:param bool track_cpu_count:
+		if True powerline will continuously poll the system to detect changes 
+		in the number of CPUs.
 
 	Divider highlight group used: ``background:divider``.
 
@@ -511,7 +515,7 @@ def system_load(pl, format='{avg:.1f}', threshold_good=1, threshold_bad=2):
 	'''
 	global cpu_count
 	try:
-		cpu_num = cpu_count()
+		cpu_num = cpu_count = _cpu_count() if cpu_count is None or track_cpu_count else cpu_count
 	except NotImplementedError:
 		pl.warn('Unable to get CPU count: method is not implemented')
 		return None
diff --git a/tests/test_segments.py b/tests/test_segments.py
index d8c7bb3d..43067de0 100644
--- a/tests/test_segments.py
+++ b/tests/test_segments.py
@@ -224,7 +224,7 @@ class TestCommon(TestCase):
 	def test_system_load(self):
 		pl = Pl()
 		with replace_module_module(common, 'os', getloadavg=lambda: (7.5, 3.5, 1.5)):
-			with replace_attr(common, 'cpu_count', lambda: 2):
+			with replace_attr(common, '_cpu_count', lambda: 2):
 				self.assertEqual(common.system_load(pl=pl),
 						[{'contents': '7.5 ', 'highlight_group': ['system_load_gradient', 'system_load'], 'divider_highlight_group': 'background:divider', 'gradient_level': 100},
 						{'contents': '3.5 ', 'highlight_group': ['system_load_gradient', 'system_load'], 'divider_highlight_group': 'background:divider', 'gradient_level': 75.0},