diff --git a/src/add-ons/kernel/debugger/disasm/x86/libudis86/decode.h b/headers/libs/udis86/libudis86/decode.h
similarity index 100%
rename from src/add-ons/kernel/debugger/disasm/x86/libudis86/decode.h
rename to headers/libs/udis86/libudis86/decode.h
diff --git a/src/add-ons/kernel/debugger/disasm/x86/libudis86/extern.h b/headers/libs/udis86/libudis86/extern.h
similarity index 100%
rename from src/add-ons/kernel/debugger/disasm/x86/libudis86/extern.h
rename to headers/libs/udis86/libudis86/extern.h
diff --git a/src/add-ons/kernel/debugger/disasm/x86/libudis86/input.h b/headers/libs/udis86/libudis86/input.h
similarity index 100%
rename from src/add-ons/kernel/debugger/disasm/x86/libudis86/input.h
rename to headers/libs/udis86/libudis86/input.h
diff --git a/src/add-ons/kernel/debugger/disasm/x86/libudis86/itab.h b/headers/libs/udis86/libudis86/itab.h
similarity index 100%
rename from src/add-ons/kernel/debugger/disasm/x86/libudis86/itab.h
rename to headers/libs/udis86/libudis86/itab.h
diff --git a/src/add-ons/kernel/debugger/disasm/x86/libudis86/syn.h b/headers/libs/udis86/libudis86/syn.h
similarity index 100%
rename from src/add-ons/kernel/debugger/disasm/x86/libudis86/syn.h
rename to headers/libs/udis86/libudis86/syn.h
diff --git a/src/add-ons/kernel/debugger/disasm/x86/libudis86/types.h b/headers/libs/udis86/libudis86/types.h
similarity index 100%
rename from src/add-ons/kernel/debugger/disasm/x86/libudis86/types.h
rename to headers/libs/udis86/libudis86/types.h
diff --git a/src/add-ons/kernel/debugger/disasm/x86/udis86.h b/headers/libs/udis86/udis86.h
similarity index 100%
rename from src/add-ons/kernel/debugger/disasm/x86/udis86.h
rename to headers/libs/udis86/udis86.h
diff --git a/src/add-ons/kernel/debugger/disasm/x86/Jamfile b/src/add-ons/kernel/debugger/disasm/x86/Jamfile
index b14f5d322a..545241e99c 100644
--- a/src/add-ons/kernel/debugger/disasm/x86/Jamfile
+++ b/src/add-ons/kernel/debugger/disasm/x86/Jamfile
@@ -1,7 +1,8 @@
 SubDir HAIKU_TOP src add-ons kernel debugger disasm $(TARGET_ARCH) ;
 
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
-SubDirHdrs [ FDirName $(SUBDIR) libudis86 ] ;
+UseHeaders [ LibraryHeaders udis86 ] ;
+UseHeaders [ LibraryHeaders [ FDirName udis86 libudis86 ] ] ;
 
 DEFINES += __UD_STANDALONE__ ;
 DEFINES += assert=disasm_arch_assert ;
@@ -23,5 +24,4 @@ KernelStaticLibrary disasm_arch.a :
 ;
 
 SEARCH on [ FGristFiles $(libUdis86Sources) ]
-	= [ FDirName $(SUBDIR) libudis86 ] ;
-
+	= [ FDirName $(HAIKU_TOP) src libs udis86 ] ;
diff --git a/src/libs/Jamfile b/src/libs/Jamfile
index 0f067234a2..53611f0dbc 100644
--- a/src/libs/Jamfile
+++ b/src/libs/Jamfile
@@ -21,5 +21,6 @@ SubInclude HAIKU_TOP src libs posix_error_mapper ;
 SubInclude HAIKU_TOP src libs print ;
 SubInclude HAIKU_TOP src libs stdc++ ;
 SubInclude HAIKU_TOP src libs termcap ;
+SubInclude HAIKU_TOP src libs udis86 ;
 SubInclude HAIKU_TOP src libs util ;
 SubInclude HAIKU_TOP src libs zlib ;
diff --git a/src/add-ons/kernel/debugger/disasm/x86/libudis86/decode.c b/src/libs/udis86/decode.c
similarity index 100%
rename from src/add-ons/kernel/debugger/disasm/x86/libudis86/decode.c
rename to src/libs/udis86/decode.c
diff --git a/src/add-ons/kernel/debugger/disasm/x86/libudis86/input.c b/src/libs/udis86/input.c
similarity index 100%
rename from src/add-ons/kernel/debugger/disasm/x86/libudis86/input.c
rename to src/libs/udis86/input.c
diff --git a/src/add-ons/kernel/debugger/disasm/x86/libudis86/itab.c b/src/libs/udis86/itab.c
similarity index 100%
rename from src/add-ons/kernel/debugger/disasm/x86/libudis86/itab.c
rename to src/libs/udis86/itab.c
diff --git a/src/add-ons/kernel/debugger/disasm/x86/libudis86/syn-att.c b/src/libs/udis86/syn-att.c
similarity index 100%
rename from src/add-ons/kernel/debugger/disasm/x86/libudis86/syn-att.c
rename to src/libs/udis86/syn-att.c
diff --git a/src/add-ons/kernel/debugger/disasm/x86/libudis86/syn-intel.c b/src/libs/udis86/syn-intel.c
similarity index 100%
rename from src/add-ons/kernel/debugger/disasm/x86/libudis86/syn-intel.c
rename to src/libs/udis86/syn-intel.c
diff --git a/src/add-ons/kernel/debugger/disasm/x86/libudis86/syn.c b/src/libs/udis86/syn.c
similarity index 100%
rename from src/add-ons/kernel/debugger/disasm/x86/libudis86/syn.c
rename to src/libs/udis86/syn.c
diff --git a/src/add-ons/kernel/debugger/disasm/x86/libudis86/udis86.c b/src/libs/udis86/udis86.c
similarity index 100%
rename from src/add-ons/kernel/debugger/disasm/x86/libudis86/udis86.c
rename to src/libs/udis86/udis86.c