diff -r 0b164a321177 -r 68af6b83ff7e config/tools/libelf.in
--- a/config/tools/libelf.in	Thu Oct 09 19:17:49 2008 +0000
+++ b/config/tools/libelf.in	Fri Oct 10 14:30:44 2008 +0000
@@ -1,11 +1,7 @@
+# EXPERIMENTAL
 # libelf config file
 
-menuconfig LIBELF
-    bool
-    prompt "libelf (BROKEN)"
-    default n
-    depends on EXPERIMENTAL
-    depends on ! BARE_METAL
+config TOOL_libelf
     help
       libelf lets you read, modify or create ELF files in an
       architecture-independent way.
@@ -14,8 +10,6 @@
       please be so kind as to tell me. (By working, I mean it is
       useable at least by ltrace.) Thank you!
 
-if LIBELF
-
 choice
     bool
     prompt "libelf version"
@@ -44,5 +38,3 @@
     default "0.8.10" if LIBELF_V_0_8_10
 # CT_INSERT_VERSION_STRING_ABOVE
 # Don't remove above line!
-
-endif