diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 38f0e8c9b53..88fb22e4221 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-26  Ben Elliston  <bje@au.ibm.com>
+
+	* elf.c (bfd_elf_set_dyn_lib_class): Change second argument type
+	from int to enum dynamic_lib_link_class lib_class.
+	* bfd-in.h (bfd_elf_set_dyn_lib_class): Likewise.
+	* bfd-in2.h: Regenerate.
+
 2006-10-25  Alan Modra  <amodra@bigpond.net.au>
 	    Trevor Smigiel  <Trevor_Smigiel@playstation.sony.com>
 	    Yukishige Shibata  <shibata@rd.scei.sony.co.jp>
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index 8d86a239510..ed41851ba53 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -686,7 +686,7 @@ extern void bfd_elf_set_dt_needed_name
 extern const char *bfd_elf_get_dt_soname
   (bfd *);
 extern void bfd_elf_set_dyn_lib_class
-  (bfd *, int);
+  (bfd *, enum dynamic_lib_link_class);
 extern int bfd_elf_get_dyn_lib_class
   (bfd *);
 extern struct bfd_link_needed_list *bfd_elf_get_runpath_list
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 882f61ad969..813d748be97 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -693,7 +693,7 @@ extern void bfd_elf_set_dt_needed_name
 extern const char *bfd_elf_get_dt_soname
   (bfd *);
 extern void bfd_elf_set_dyn_lib_class
-  (bfd *, int);
+  (bfd *, enum dynamic_lib_link_class);
 extern int bfd_elf_get_dyn_lib_class
   (bfd *);
 extern struct bfd_link_needed_list *bfd_elf_get_runpath_list
diff --git a/bfd/elf.c b/bfd/elf.c
index 010a9785b5a..84362fcffb7 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -1668,7 +1668,7 @@ bfd_elf_get_dyn_lib_class (bfd *abfd)
 }
 
 void
-bfd_elf_set_dyn_lib_class (bfd *abfd, int lib_class)
+bfd_elf_set_dyn_lib_class (bfd *abfd, enum dynamic_lib_link_class lib_class)
 {
   if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
       && bfd_get_format (abfd) == bfd_object)