diff --git a/contrib/llvm/projects/libunwind/LICENSE.TXT b/contrib/libunwind/LICENSE.TXT
similarity index 100%
rename from contrib/llvm/projects/libunwind/LICENSE.TXT
rename to contrib/libunwind/LICENSE.TXT
diff --git a/contrib/llvm/projects/libunwind/include/__libunwind_config.h b/contrib/libunwind/include/__libunwind_config.h
similarity index 100%
rename from contrib/llvm/projects/libunwind/include/__libunwind_config.h
rename to contrib/libunwind/include/__libunwind_config.h
diff --git a/contrib/llvm/projects/libunwind/include/libunwind.h b/contrib/libunwind/include/libunwind.h
similarity index 100%
rename from contrib/llvm/projects/libunwind/include/libunwind.h
rename to contrib/libunwind/include/libunwind.h
diff --git a/contrib/llvm/projects/libunwind/include/mach-o/compact_unwind_encoding.h b/contrib/libunwind/include/mach-o/compact_unwind_encoding.h
similarity index 100%
rename from contrib/llvm/projects/libunwind/include/mach-o/compact_unwind_encoding.h
rename to contrib/libunwind/include/mach-o/compact_unwind_encoding.h
diff --git a/contrib/llvm/projects/libunwind/include/unwind.h b/contrib/libunwind/include/unwind.h
similarity index 100%
rename from contrib/llvm/projects/libunwind/include/unwind.h
rename to contrib/libunwind/include/unwind.h
diff --git a/contrib/llvm/projects/libunwind/src/AddressSpace.hpp b/contrib/libunwind/src/AddressSpace.hpp
similarity index 100%
rename from contrib/llvm/projects/libunwind/src/AddressSpace.hpp
rename to contrib/libunwind/src/AddressSpace.hpp
diff --git a/contrib/llvm/projects/libunwind/src/CompactUnwinder.hpp b/contrib/libunwind/src/CompactUnwinder.hpp
similarity index 100%
rename from contrib/llvm/projects/libunwind/src/CompactUnwinder.hpp
rename to contrib/libunwind/src/CompactUnwinder.hpp
diff --git a/contrib/llvm/projects/libunwind/src/DwarfInstructions.hpp b/contrib/libunwind/src/DwarfInstructions.hpp
similarity index 100%
rename from contrib/llvm/projects/libunwind/src/DwarfInstructions.hpp
rename to contrib/libunwind/src/DwarfInstructions.hpp
diff --git a/contrib/llvm/projects/libunwind/src/DwarfParser.hpp b/contrib/libunwind/src/DwarfParser.hpp
similarity index 100%
rename from contrib/llvm/projects/libunwind/src/DwarfParser.hpp
rename to contrib/libunwind/src/DwarfParser.hpp
diff --git a/contrib/llvm/projects/libunwind/src/EHHeaderParser.hpp b/contrib/libunwind/src/EHHeaderParser.hpp
similarity index 100%
rename from contrib/llvm/projects/libunwind/src/EHHeaderParser.hpp
rename to contrib/libunwind/src/EHHeaderParser.hpp
diff --git a/contrib/llvm/projects/libunwind/src/RWMutex.hpp b/contrib/libunwind/src/RWMutex.hpp
similarity index 100%
rename from contrib/llvm/projects/libunwind/src/RWMutex.hpp
rename to contrib/libunwind/src/RWMutex.hpp
diff --git a/contrib/llvm/projects/libunwind/src/Registers.hpp b/contrib/libunwind/src/Registers.hpp
similarity index 100%
rename from contrib/llvm/projects/libunwind/src/Registers.hpp
rename to contrib/libunwind/src/Registers.hpp
diff --git a/contrib/llvm/projects/libunwind/src/Unwind-EHABI.cpp b/contrib/libunwind/src/Unwind-EHABI.cpp
similarity index 100%
rename from contrib/llvm/projects/libunwind/src/Unwind-EHABI.cpp
rename to contrib/libunwind/src/Unwind-EHABI.cpp
diff --git a/contrib/llvm/projects/libunwind/src/Unwind-EHABI.h b/contrib/libunwind/src/Unwind-EHABI.h
similarity index 100%
rename from contrib/llvm/projects/libunwind/src/Unwind-EHABI.h
rename to contrib/libunwind/src/Unwind-EHABI.h
diff --git a/contrib/llvm/projects/libunwind/src/Unwind-seh.cpp b/contrib/libunwind/src/Unwind-seh.cpp
similarity index 100%
rename from contrib/llvm/projects/libunwind/src/Unwind-seh.cpp
rename to contrib/libunwind/src/Unwind-seh.cpp
diff --git a/contrib/llvm/projects/libunwind/src/Unwind-sjlj.c b/contrib/libunwind/src/Unwind-sjlj.c
similarity index 100%
rename from contrib/llvm/projects/libunwind/src/Unwind-sjlj.c
rename to contrib/libunwind/src/Unwind-sjlj.c
diff --git a/contrib/llvm/projects/libunwind/src/UnwindCursor.hpp b/contrib/libunwind/src/UnwindCursor.hpp
similarity index 100%
rename from contrib/llvm/projects/libunwind/src/UnwindCursor.hpp
rename to contrib/libunwind/src/UnwindCursor.hpp
diff --git a/contrib/llvm/projects/libunwind/src/UnwindLevel1-gcc-ext.c b/contrib/libunwind/src/UnwindLevel1-gcc-ext.c
similarity index 100%
rename from contrib/llvm/projects/libunwind/src/UnwindLevel1-gcc-ext.c
rename to contrib/libunwind/src/UnwindLevel1-gcc-ext.c
diff --git a/contrib/llvm/projects/libunwind/src/UnwindLevel1.c b/contrib/libunwind/src/UnwindLevel1.c
similarity index 100%
rename from contrib/llvm/projects/libunwind/src/UnwindLevel1.c
rename to contrib/libunwind/src/UnwindLevel1.c
diff --git a/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S b/contrib/libunwind/src/UnwindRegistersRestore.S
similarity index 100%
rename from contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S
rename to contrib/libunwind/src/UnwindRegistersRestore.S
diff --git a/contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S b/contrib/libunwind/src/UnwindRegistersSave.S
similarity index 100%
rename from contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S
rename to contrib/libunwind/src/UnwindRegistersSave.S
diff --git a/contrib/llvm/projects/libunwind/src/Unwind_AppleExtras.cpp b/contrib/libunwind/src/Unwind_AppleExtras.cpp
similarity index 100%
rename from contrib/llvm/projects/libunwind/src/Unwind_AppleExtras.cpp
rename to contrib/libunwind/src/Unwind_AppleExtras.cpp
diff --git a/contrib/llvm/projects/libunwind/src/assembly.h b/contrib/libunwind/src/assembly.h
similarity index 100%
rename from contrib/llvm/projects/libunwind/src/assembly.h
rename to contrib/libunwind/src/assembly.h
diff --git a/contrib/llvm/projects/libunwind/src/config.h b/contrib/libunwind/src/config.h
similarity index 100%
rename from contrib/llvm/projects/libunwind/src/config.h
rename to contrib/libunwind/src/config.h
diff --git a/contrib/llvm/projects/libunwind/src/dwarf2.h b/contrib/libunwind/src/dwarf2.h
similarity index 100%
rename from contrib/llvm/projects/libunwind/src/dwarf2.h
rename to contrib/libunwind/src/dwarf2.h
diff --git a/contrib/llvm/projects/libunwind/src/libunwind.cpp b/contrib/libunwind/src/libunwind.cpp
similarity index 100%
rename from contrib/llvm/projects/libunwind/src/libunwind.cpp
rename to contrib/libunwind/src/libunwind.cpp
diff --git a/contrib/llvm/projects/libunwind/src/libunwind_ext.h b/contrib/libunwind/src/libunwind_ext.h
similarity index 100%
rename from contrib/llvm/projects/libunwind/src/libunwind_ext.h
rename to contrib/libunwind/src/libunwind_ext.h
diff --git a/lib/libgcc_eh/Makefile.inc b/lib/libgcc_eh/Makefile.inc
index a8536e2413f1..5c8af2141382 100644
--- a/lib/libgcc_eh/Makefile.inc
+++ b/lib/libgcc_eh/Makefile.inc
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 COMPILERRTDIR=	${SRCTOP}/contrib/compiler-rt
-UNWINDINCDIR=	${SRCTOP}/contrib/llvm/projects/libunwind/include
-UNWINDSRCDIR=	${SRCTOP}/contrib/llvm/projects/libunwind/src
+UNWINDINCDIR=	${SRCTOP}/contrib/libunwind/include
+UNWINDSRCDIR=	${SRCTOP}/contrib/libunwind/src
 
 STATIC_CFLAGS+=${PICFLAG} -fvisibility=hidden -DVISIBILITY_HIDDEN