diff --git a/demo/iso.c b/demo/iso.c
index 2588765..2fdaf0e 100644
--- a/demo/iso.c
+++ b/demo/iso.c
@@ -21,18 +21,20 @@ void usage(char **argv)
 
 int main(int argc, char **argv)
 {
-	int result;
+    int result;
     IsoImage *image;
     struct burn_source *burn_src;
     unsigned char buf[2048];
     FILE *fd;
     Ecma119WriteOpts opts = {
         1, /* level */ 
-        0, /* flags */
+        1, /* rockridge */
+        0, /* omit_version_numbers */
+        0, /* allow_deep_paths */
         0 /* sort files */
     };
 	
-	if (argc < 2) {
+    if (argc < 2) {
         printf ("Please pass directory from which to build ISO\n");
         usage(argv);
         return 1;
@@ -53,7 +55,7 @@ int main(int argc, char **argv)
         printf ("Error creating image\n");
         return 1;
     }
-	iso_image_set_msgs_severities(image, "NEVER", "ALL", "");
+    iso_image_set_msgs_severities(image, "NEVER", "ALL", "");
 	
     result = iso_tree_add_dir_rec(image, iso_image_get_root(image), argv[1]);
     if (result < 0) {
diff --git a/src/ecma119.c b/src/ecma119.c
index bdb9621..a0d60fb 100644
--- a/src/ecma119.c
+++ b/src/ecma119.c
@@ -730,10 +730,10 @@ int ecma119_image_new(IsoImage *src, Ecma119WriteOpts *opts,
     iso_image_ref(src);
     
     target->iso_level = opts->level;
-    target->rockridge = 1; //TODO
+    target->rockridge = opts->rockridge;
     target->ino = 0;
     target->omit_version_numbers = opts->omit_version_numbers;
-    target->allow_deep_paths = 0; //TODO
+    target->allow_deep_paths = opts->allow_deep_paths;
     target->sort_files = opts->sort_files;
     
     target->now = time(NULL);
diff --git a/src/libisofs.h b/src/libisofs.h
index e2617e5..5a7a96f 100644
--- a/src/libisofs.h
+++ b/src/libisofs.h
@@ -61,10 +61,13 @@ enum IsoHideNodeFlag {
 typedef struct {
     //int volnum; /**< The volume in the set which you want to write (usually 0) */
     int level;  /**< ISO level to write at. */
-    int flags;  /**< Which extensions to support. */
+
+    /** Which extensions to support. */
+    unsigned int rockridge:1;
     
     /* relaxed constraints */
     unsigned int omit_version_numbers:1;
+    unsigned int allow_deep_paths:1;
     //int relaxed_constraints; /**< see ecma119_relaxed_constraints_flag */
     
     //unsigned int copy_eltorito:1;