diff --git a/sys/fs/udf/udf.h b/sys/fs/udf/udf.h
index 28289a205802..452e76362fc3 100644
--- a/sys/fs/udf/udf.h
+++ b/sys/fs/udf/udf.h
@@ -1,4 +1,4 @@
-/* $NetBSD: udf.h,v 1.19 2008/07/19 16:00:35 reinoud Exp $ */
+/* $NetBSD: udf.h,v 1.20 2008/07/19 16:14:09 reinoud Exp $ */
 
 /*
  * Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -179,11 +179,6 @@ extern int udf_verbose;
 #define UDF_ALLOC_RELAXEDSEQUENTIAL  6  /* only nodes not seq.           */
 
 
-/* allocation descriptor styles */
-#define UDF_ALLOCDSCR_SHORT	     1	/* use short_ad allocation dscr. */
-#define UDF_ALLOCDSCR_LONG	     2	/* use long_ad  allocation dscr. */
-
-
 /* logical volume open/close actions */
 #define UDF_OPEN_SESSION	  0x01  /* if needed writeout VRS + VDS	     */
 #define UDF_CLOSE_SESSION	  0x02	/* close session after writing VAT   */
diff --git a/sys/fs/udf/udf_subr.c b/sys/fs/udf/udf_subr.c
index 24efc804a5a6..1b7acb3b6920 100644
--- a/sys/fs/udf/udf_subr.c
+++ b/sys/fs/udf/udf_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_subr.c,v 1.64 2008/07/19 16:00:35 reinoud Exp $ */
+/* $NetBSD: udf_subr.c,v 1.65 2008/07/19 16:14:09 reinoud Exp $ */
 
 /*
  * Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.64 2008/07/19 16:00:35 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.65 2008/07/19 16:14:09 reinoud Exp $");
 #endif /* not lint */
 
 
@@ -1816,14 +1816,14 @@ udf_process_vds(struct udf_mount *ump) {
 	}
 
 	/* determine default allocation descriptors to use */
-	ump->data_allocdscr = UDF_ALLOCDSCR_SHORT;
-	ump->meta_allocdscr = UDF_ALLOCDSCR_SHORT;
+	ump->data_allocdscr = UDF_ICB_SHORT_ALLOC;
+	ump->meta_allocdscr = UDF_ICB_SHORT_ALLOC;
 	if (n_pm > 1) {
-		ump->data_allocdscr = UDF_ALLOCDSCR_LONG;
-		ump->meta_allocdscr = UDF_ALLOCDSCR_LONG;
+		ump->data_allocdscr = UDF_ICB_LONG_ALLOC;
+		ump->meta_allocdscr = UDF_ICB_LONG_ALLOC;
 		/* metadata partitions are forced to have short */
 		if (n_meta)
-			ump->meta_allocdscr = UDF_ALLOCDSCR_SHORT;
+			ump->meta_allocdscr = UDF_ICB_SHORT_ALLOC;
 	}
 
 	/* determine logical volume open/closure actions */