diff --git a/xorriso/read_run.c b/xorriso/read_run.c
index c4bab8c3..0c13df79 100644
--- a/xorriso/read_run.c
+++ b/xorriso/read_run.c
@@ -1487,8 +1487,9 @@ probably_damaged:;
      Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, errno, "FAILURE", 0);
      ret= 0; goto ex;
    }
-   ret= mknod(disk_path, mode, dev);
-   l_errno= errno;
+   ret= iso_local_create_dev(disk_path, mode, dev, &l_errno, 0);
+   if(ret < 0)
+     ret= -1;
 
  } else if(LIBISO_ISBLK(node)) {
    what= "block device";
@@ -1500,13 +1501,14 @@ probably_damaged:;
      goto ex;
    if(dev == (dev_t) 1)
      goto probably_damaged;
-   ret= mknod(disk_path, mode, dev);
-   l_errno= errno;
+   ret= iso_local_create_dev(disk_path, mode, dev, &l_errno, 0);
+   if(ret < 0)
+     ret= -1;
 
  } else if(LIBISO_ISFIFO(node)) {
    what= "named pipe";
-   mode= S_IFIFO | 0777;
-   ret= mknod(disk_path, mode, dev);
+   mode= 0777;
+   ret= mkfifo(disk_path, mode);
    l_errno= errno;
 
  } else if(LIBISO_ISSOCK(node)) {
diff --git a/xorriso/text_io.c b/xorriso/text_io.c
index 50188feb..93697754 100644
--- a/xorriso/text_io.c
+++ b/xorriso/text_io.c
@@ -4526,8 +4526,7 @@ int Xorriso_launch_frontend(struct XorrisO *xorriso, int argc, char **argv,
        adrpt= reply_pipe_adr;
      ret= stat(adrpt, &stbuf);
      if(ret == -1) {
-       ret= mknod(adrpt, S_IFIFO | S_IRWXU | S_IRWXG | S_IRWXO | S_IRWXO,
-                  (dev_t) 0);
+       ret= mkfifo(adrpt, S_IRWXU | S_IRWXG | S_IRWXO | S_IRWXO);
        if(ret == -1) {
           sprintf(xorriso->info_text,
                   "-launch_frontend: Cannot create named pipe %s",
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index d8242ea4..062c04b1 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2025.04.12.090426"
+#define Xorriso_timestamP "2025.04.16.073939"