diff --git a/files/ini_file.py b/files/ini_file.py
index ef4f8f56d90..af250f42405 100644
--- a/files/ini_file.py
+++ b/files/ini_file.py
@@ -110,16 +110,16 @@ import os
 
 def match_opt(option, line):
   option = re.escape(option)
-  return re.match('%s *=' % option, line) \
-    or re.match('# *%s *=' % option, line) \
-    or re.match('; *%s *=' % option, line)
+  return re.match('%s( |\t)*=' % option, line) \
+    or re.match('# *%s( |\t)*=' % option, line) \
+    or re.match('; *%s( |\t)*=' % option, line)
 
 # ==============================================================
 # match_active_opt
 
 def match_active_opt(option, line):
   option = re.escape(option)
-  return re.match('%s *=' % option, line)
+  return re.match('%s( |\t)*=' % option, line)
 
 # ==============================================================
 # do_ini