diff --git a/examples/Fibonacci/Makefile b/examples/Fibonacci/Makefile
index a6d378591f9..b63777eb295 100644
--- a/examples/Fibonacci/Makefile
+++ b/examples/Fibonacci/Makefile
@@ -12,6 +12,6 @@ TOOLNAME = Fibonacci
 EXAMPLE_TOOL = 1
 
 # Enable JIT support
-include $(LEVEL)/tools/Makefile.JIT
+LLVMLIBS := JIT
 
 include $(LEVEL)/Makefile.common
diff --git a/examples/HowToUseJIT/Makefile b/examples/HowToUseJIT/Makefile
index 0f5e26b5ca3..67fdd861114 100644
--- a/examples/HowToUseJIT/Makefile
+++ b/examples/HowToUseJIT/Makefile
@@ -11,6 +11,6 @@ TOOLNAME = HowToUseJIT
 EXAMPLE_TOOL = 1
 
 # Enable JIT support
-include $(LEVEL)/tools/Makefile.JIT
+LLVMLIBS := JIT
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/lli/Makefile b/tools/lli/Makefile
index 394fec6d9bf..0e537f9d7dd 100644
--- a/tools/lli/Makefile
+++ b/tools/lli/Makefile
@@ -6,15 +6,9 @@
 # the University of Illinois Open Source License. See LICENSE.TXT for details.
 # 
 ##===----------------------------------------------------------------------===##
-LEVEL = ../..
-TOOLNAME = lli
+LEVEL    := ../..
+TOOLNAME := lli
+LLVMLIBS := JIT
 
 # Enable JIT support
-include ../Makefile.JIT
-
-# Have gcc tell the linker to export symbols from the program so that
-# dynamically loaded modules can be linked against them.
-#
-TOOLLINKOPTS = $(PLATFORMLIBDL)
-
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-db/Makefile b/tools/llvm-db/Makefile
index e1f1f2d9b7d..fe31e3c4b00 100644
--- a/tools/llvm-db/Makefile
+++ b/tools/llvm-db/Makefile
@@ -12,12 +12,6 @@ TOOLNAME = llvm-db
 USEDLIBS = LLVMDebugger
 
 # Enable JIT support
-include ../Makefile.JIT
-
-# Have gcc tell the linker to export symbols from the program so that
-# dynamically loaded modules can be linked against them.
-#
-TOOLLINKOPTS = $(PLATFORMLIBDL)
+LLVMLIBS = JIT
 
 include $(LEVEL)/Makefile.common
-