diff --git a/example/udf1.c b/example/udf1.c
index 259720cf..4dc5a9b7 100644
--- a/example/udf1.c
+++ b/example/udf1.c
@@ -1,5 +1,5 @@
 /*
-  $Id: udf1.c,v 1.14 2005/11/01 03:14:49 rocky Exp $
+  $Id: udf1.c,v 1.15 2005/11/01 03:21:04 rocky Exp $
 
   Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
   
@@ -76,7 +76,7 @@ list_files(udf_t *p_udf, udf_dirent_t *p_udf_dirent, const char *psz_path)
       
     if (udf_is_dir(p_udf_dirent)) {
       
-      udf_dirent_t *p_udf_dirent2 = udf_opendir(p_udf, p_udf_dirent);
+      udf_dirent_t *p_udf_dirent2 = udf_opendir(p_udf_dirent);
       if (p_udf_dirent2) {
 	const char *psz_dirname = udf_get_filename(p_udf_dirent);
 	const unsigned int i_newlen=2 + strlen(psz_path) + strlen(psz_dirname);
diff --git a/include/cdio/udf_file.h b/include/cdio/udf_file.h
index 64101135..ebd69166 100644
--- a/include/cdio/udf_file.h
+++ b/include/cdio/udf_file.h
@@ -1,5 +1,5 @@
 /*  
-    $Id: udf_file.h,v 1.2 2005/11/01 03:14:50 rocky Exp $
+    $Id: udf_file.h,v 1.3 2005/11/01 03:21:04 rocky Exp $
     Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
 
     This program is free software; you can redistribute it and/or modify
@@ -61,7 +61,7 @@ extern "C" {
   /*!
     Return the next subdirectory. 
   */
-  udf_dirent_t *udf_opendir(udf_t *p_udf, const udf_dirent_t *p_udf_dirent);
+  udf_dirent_t *udf_opendir(const udf_dirent_t *p_udf_dirent);
   
   /*!
     Advances p_udf_direct to the the next directory entry in the
diff --git a/lib/udf/udf_fs.c b/lib/udf/udf_fs.c
index f9a97220..5c1eccbb 100644
--- a/lib/udf/udf_fs.c
+++ b/lib/udf/udf_fs.c
@@ -1,5 +1,5 @@
 /*
-    $Id: udf_fs.c,v 1.10 2005/11/01 03:14:50 rocky Exp $
+    $Id: udf_fs.c,v 1.11 2005/11/01 03:21:04 rocky Exp $
 
     Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
 
@@ -199,7 +199,7 @@ udf_ff_traverse(udf_t *p_udf, udf_dirent_t *p_udf_dirent, char *psz_token)
       if (!next_tok)
 	return p_udf_dirent; /* found */
       else if (p_udf_dirent->b_dir) {
-	udf_dirent_t * p_udf_dirent2 = udf_opendir(p_udf, p_udf_dirent);
+	udf_dirent_t * p_udf_dirent2 = udf_opendir(p_udf_dirent);
 	
 	if (p_udf_dirent2) {
 	  udf_dirent_t * p_udf_dirent3 = 
@@ -550,9 +550,10 @@ udf_close (udf_t *p_udf)
 }
 
 udf_dirent_t * 
-udf_opendir(udf_t *p_udf, const udf_dirent_t *p_udf_dirent)
+udf_opendir(const udf_dirent_t *p_udf_dirent)
 {
   if (p_udf_dirent->b_dir && !p_udf_dirent->b_parent && p_udf_dirent->fid) {
+    udf_t *p_udf = p_udf_dirent->p_udf;
     uint8_t data[UDF_BLOCKSIZE];
     udf_file_entry_t *p_udf_fe = (udf_file_entry_t *) &data;