diff --git a/tuned/profiles/loader.py b/tuned/profiles/loader.py
index 0c7520c..9c7db2b 100644
--- a/tuned/profiles/loader.py
+++ b/tuned/profiles/loader.py
@@ -60,8 +60,14 @@ class Loader(object):
 		if "variables" in final_profile.units:
 			self._variables.add_from_cfg(final_profile.units["variables"].options)
 			del(final_profile.units["variables"])
+		# FIXME hack, do all variable expansions in one place
+		self._expand_vars_in_devices(final_profile)
 		return final_profile
 
+	def _expand_vars_in_devices(self, profile):
+		for unit in profile.units:
+			profile.units[unit].devices = self._variables.expand(profile.units[unit].devices)
+
 	def _load_profile(self, profile_names, profiles, processed_files):
 		for name in profile_names:
 			filename = self._profile_locator.get_config(name, processed_files)