diff --git a/src/bin/pungi.py b/src/bin/pungi.py
index a247a568..ca7ced87 100755
--- a/src/bin/pungi.py
+++ b/src/bin/pungi.py
@@ -108,6 +108,8 @@ def main():
         config.set('pungi', 'lookaside_repos', " ".join(opts.lookaside_repos))
     if opts.no_dvd:
         config.set('pungi', 'no_dvd', "True")
+    if opts.nomacboot:
+        config.set('pungi', 'nomacboot', "True")
     config.set("pungi", "fulltree", str(bool(opts.fulltree)))
     config.set("pungi", "selfhosting", str(bool(opts.selfhosting)))
     config.set("pungi", "nosource", str(bool(opts.nosource)))
@@ -289,6 +291,7 @@ if __name__ == '__main__':
         parser.add_option("--relnotefilere", dest="relnotefilere", type="string",
           action="callback", callback=set_config, callback_args=(config, ),
           help='Which files are the release notes -- GPL EULA')
+        parser.add_option("--nomacboot", action="store_true", dest="nomacboot",           help='disable setting up macboot as no hfs support ')
 
 
         (opts, args) = parser.parse_args()
diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py
index b4fe2c83..c1318ce6 100644
--- a/src/pypungi/__init__.py
+++ b/src/pypungi/__init__.py
@@ -1401,7 +1401,10 @@ class Pungi(pypungi.PungiBase):
 
         # Only supported mac hardware is x86 make sure we only enable mac support on arches that need it
         if self.tree_arch in ['x86_64']:
-            domacboot = True
+            if self.config.getboolean('pungi','nomacboot'):
+                   domacboot = False
+            else:
+                   domacboot = True
         else:
             domacboot = False
 
diff --git a/src/pypungi/config.py b/src/pypungi/config.py
index 8856857c..617ae181 100644
--- a/src/pypungi/config.py
+++ b/src/pypungi/config.py
@@ -53,3 +53,4 @@ class Config(SafeConfigParser):
         self.set('pungi', 'lookaside_repos', '')
         self.set('pungi', 'resolve_deps', "True")
         self.set('pungi', 'no_dvd', "False")
+        self.set('pungi', 'nomacboot', "False")