diff --git a/testcloud/image.py b/testcloud/image.py
index 3428b05..d80ba78 100644
--- a/testcloud/image.py
+++ b/testcloud/image.py
@@ -264,7 +264,7 @@ class Image(object):
         try:
             selinux_active = subprocess.call(["selinuxenabled"])
         except FileNotFoundError:
-            logging.debug("selinuxenabled is not present (libselinux-utils package missing?)")
+            logging.debug("selinuxenabled is not present (selinux-tools package missing?)")
             logging.debug("Assuming selinux is not installed and therefore disabled")
             selinux_active = 1
 
diff --git a/testcloud/instance.py b/testcloud/instance.py
index 8c9ff72..2e91ed5 100644
--- a/testcloud/instance.py
+++ b/testcloud/instance.py
@@ -421,14 +421,14 @@ class Instance(object):
 
         make_image = subprocess.call(
             [
-                "genisoimage",
+                "xorrisofs",
-                "--input-charset",
+                "-input-charset",
                 "utf-8",
-                "--volid",
+                "-volid",
                 "cidata",
-                "--joliet",
-                "--rock",
-                "--quiet",
+                "-joliet",
+                "-rock",
+                "-quiet",
                 "--output",
                 self.seed_path,
                 ".",