diff --git a/llvm/test/LLVMC/emit-llvm.c b/llvm/test/LLVMC/emit-llvm.c
index 5a6aa0f538ae93e849bd938db2c73dcd4c2321a6..38bbba6f0afc7ba720a1345e86b0be45e9201c32 100644
--- a/llvm/test/LLVMC/emit-llvm.c
+++ b/llvm/test/LLVMC/emit-llvm.c
@@ -1,4 +1,4 @@
-// RUN: llvmc2 -c -emit-llvm -o - %s | llvm-dis | grep "@f0()" | count 1
+// RUN: llvmc -c -emit-llvm -o - %s | llvm-dis | grep "@f0()" | count 1
 
 int f0(void) {
 }
diff --git a/llvm/test/LLVMC/false.c b/llvm/test/LLVMC/false.c
index 4aa365d89a32ffc0a0c748540582101208381c8e..eb2883d699e54b2bab7af8ed8ba95c32b8ca9cd0 100644
--- a/llvm/test/LLVMC/false.c
+++ b/llvm/test/LLVMC/false.c
@@ -1,5 +1,5 @@
 // Test that we can compile .c files as C++ and vice versa
-// RUN: llvmc2 -x c++ %s -x c %p/test_data/false.cpp -x lisp -x whatnot -x none %p/test_data/false2.cpp -o %t
+// RUN: llvmc -x c++ %s -x c %p/test_data/false.cpp -x lisp -x whatnot -x none %p/test_data/false2.cpp -o %t
 // RUN: ./%t | grep hello
 
 #include <iostream>
diff --git a/llvm/test/LLVMC/hello.c b/llvm/test/LLVMC/hello.c
index bf917bcdea70c8fa6c547d2d63deffa3aa9a9121..1cda9c3a3405eafd52a0061cea0486c34b403c8d 100644
--- a/llvm/test/LLVMC/hello.c
+++ b/llvm/test/LLVMC/hello.c
@@ -1,6 +1,6 @@
 /*
  * Check that we can compile helloworld
- * RUN: llvmc2 %s -o %t
+ * RUN: llvmc %s -o %t
  * RUN: ./%t | grep hello
  */
 
diff --git a/llvm/test/LLVMC/hello.cpp b/llvm/test/LLVMC/hello.cpp
index a3148c3c164f1facaf6cc2ab5bcf34547a67d486..27c89d66fa73fd488c425a876e937bd41017df03 100644
--- a/llvm/test/LLVMC/hello.cpp
+++ b/llvm/test/LLVMC/hello.cpp
@@ -1,5 +1,5 @@
 // Test that we can compile C++ code.
-// RUN: llvmc2 %s -o %t
+// RUN: llvmc %s -o %t
 // RUN: ./%t | grep hello
 #include <iostream>
 
diff --git a/llvm/test/LLVMC/hello.m b/llvm/test/LLVMC/hello.m
index bf917bcdea70c8fa6c547d2d63deffa3aa9a9121..1cda9c3a3405eafd52a0061cea0486c34b403c8d 100644
--- a/llvm/test/LLVMC/hello.m
+++ b/llvm/test/LLVMC/hello.m
@@ -1,6 +1,6 @@
 /*
  * Check that we can compile helloworld
- * RUN: llvmc2 %s -o %t
+ * RUN: llvmc %s -o %t
  * RUN: ./%t | grep hello
  */
 
diff --git a/llvm/test/LLVMC/hello.mm b/llvm/test/LLVMC/hello.mm
index 5f14a94cccab8db3379046e5253d5f0f43819fa8..ff82e4af518d9ecd56c31d1b8494eea8220c014d 100644
--- a/llvm/test/LLVMC/hello.mm
+++ b/llvm/test/LLVMC/hello.mm
@@ -1,5 +1,5 @@
 // Test that we can compile Objective-C++ code.
-// RUN: llvmc2 %s -o %t
+// RUN: llvmc %s -o %t
 // RUN: ./%t | grep hello
 #include <iostream>
 
diff --git a/llvm/test/LLVMC/include.c b/llvm/test/LLVMC/include.c
index eeb6ca6926bb589cfbb001f19ebdeefb6bd24a3a..07ae761d2c881774befad8fb6df69fc2644cc524 100644
--- a/llvm/test/LLVMC/include.c
+++ b/llvm/test/LLVMC/include.c
@@ -1,7 +1,7 @@
 /*
  * Check that the 'include' options work.
  * RUN: echo "int x;\n" > %t1.inc
- * RUN: llvmc2 -include %t1.inc -fsyntax-only %s
+ * RUN: llvmc -include %t1.inc -fsyntax-only %s
  */
 
 int f0(void) {
diff --git a/llvm/test/LLVMC/opt-test.c b/llvm/test/LLVMC/opt-test.c
index 25ca66a5c6b45e7447fb695aea5010ff6e148772..ed2df52fed7c53b0ab815794634b0931fbd044f6 100644
--- a/llvm/test/LLVMC/opt-test.c
+++ b/llvm/test/LLVMC/opt-test.c
@@ -1,6 +1,6 @@
 /*
  * Check that the -opt switch works.
- * RUN: llvmc2 %s -opt -o %t
+ * RUN: llvmc %s -opt -o %t
  * RUN: ./%t | grep hello
  */
 
diff --git a/llvm/test/LLVMC/sink.c b/llvm/test/LLVMC/sink.c
index d1dde41bb33052f5b1b6dcb3fa27c07a09d4199d..3edbf78112e6d80a9cd1186152d9a9d7e4a17888 100644
--- a/llvm/test/LLVMC/sink.c
+++ b/llvm/test/LLVMC/sink.c
@@ -1,6 +1,6 @@
 /*
  * Check that the 'sink' options work.
- * RUN: llvmc2 -v -Wall %s -o %t |& grep "Wall"
+ * RUN: llvmc -v -Wall %s -o %t |& grep "Wall"
  * RUN: ./%t | grep hello
  */
 
diff --git a/llvm/test/LLVMC/together.cpp b/llvm/test/LLVMC/together.cpp
index 09f8d86379cbfc5e9f6eafcf253c2f0a1a5303ca..b07250e9d0b3ead139816baa914a23fff8d7fa19 100644
--- a/llvm/test/LLVMC/together.cpp
+++ b/llvm/test/LLVMC/together.cpp
@@ -1,5 +1,5 @@
 // Check that we can compile files of different types together.
-// RUN: llvmc2 %s %p/test_data/together.c -o %t
+// RUN: llvmc %s %p/test_data/together.c -o %t
 // RUN: ./%t | grep hello
 
 extern "C" void test();
diff --git a/llvm/test/LLVMC/wall.c b/llvm/test/LLVMC/wall.c
index 9af9bfba3189613d3c4bb7818b8e35e4428b2966..2c72ea69929d037e595c20e8e12b9f0ba5eebfc7 100644
--- a/llvm/test/LLVMC/wall.c
+++ b/llvm/test/LLVMC/wall.c
@@ -1,6 +1,6 @@
 /*
  * Check that -Wall works as intended
- * RUN: llvmc2 -Wall %s -o %t
+ * RUN: llvmc -Wall %s -o %t
  * RUN: ./%t | grep hello
  */
 
diff --git a/llvm/tools/Makefile b/llvm/tools/Makefile
index 30da5224a91fcbf32947bc8204d0a3aa0bd70c90..2726c1f3e43e0ddc4c1c3ee4ca6f9f00b8f846ec 100644
--- a/llvm/tools/Makefile
+++ b/llvm/tools/Makefile
@@ -1,22 +1,22 @@
 ##===- tools/Makefile --------------------------------------*- Makefile -*-===##
-# 
+#
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
-# 
+#
 ##===----------------------------------------------------------------------===##
 
 LEVEL := ..
-# NOTE: The tools are organized into five groups of four consisting of one 
-# large and three small executables. This is done to minimize memory load 
+# NOTE: The tools are organized into five groups of four consisting of one
+# large and three small executables. This is done to minimize memory load
 # in parallel builds.  Please retain this ordering.
 PARALLEL_DIRS := llvm-config  \
                  opt llvm-as llvm-dis \
                  llc llvm-ranlib llvm-ar llvm-nm \
                  llvm-ld llvm-prof llvm-link \
 		 lli gccas gccld llvm-extract llvm-db \
-		 bugpoint llvm-bcanalyzer llvm-stub llvmc2
+		 bugpoint llvm-bcanalyzer llvm-stub llvmc
 
 
 include $(LEVEL)/Makefile.config
diff --git a/llvm/tools/llvmc2/CMakeLists.txt b/llvm/tools/llvmc/CMakeLists.txt
similarity index 100%
rename from llvm/tools/llvmc2/CMakeLists.txt
rename to llvm/tools/llvmc/CMakeLists.txt
diff --git a/llvm/tools/llvmc2/Makefile b/llvm/tools/llvmc/Makefile
similarity index 82%
rename from llvm/tools/llvmc2/Makefile
rename to llvm/tools/llvmc/Makefile
index 22ca29e2ed70889dcb45fe685be05ca499e75d56..8eb35cbe9cccd1a5d598140b3bfda2f47c03cdad 100644
--- a/llvm/tools/llvmc2/Makefile
+++ b/llvm/tools/llvmc/Makefile
@@ -1,4 +1,4 @@
-##===- tools/llvmc2/Makefile -------------------------------*- Makefile -*-===##
+##===- tools/llvmc/Makefile --------------------------------*- Makefile -*-===##
 #
 #                     The LLVM Compiler Infrastructure
 #
@@ -10,7 +10,7 @@
 LEVEL = ../..
 
 BUILTIN_PLUGINS = Base
-DRIVER_NAME = llvmc2
+DRIVER_NAME = llvmc
 DIRS = plugins driver
 
 export BUILTIN_PLUGINS
diff --git a/llvm/tools/llvmc2/doc/LLVMC-Reference.rst b/llvm/tools/llvmc/doc/LLVMC-Reference.rst
similarity index 98%
rename from llvm/tools/llvmc2/doc/LLVMC-Reference.rst
rename to llvm/tools/llvmc/doc/LLVMC-Reference.rst
index 01a8be0d20eff3bbe64e7c68267dd229cd720ed9..77d9d2bd3a4ac8fb3ecfaaa97d969107aa1a9d20 100644
--- a/llvm/tools/llvmc2/doc/LLVMC-Reference.rst
+++ b/llvm/tools/llvmc/doc/LLVMC-Reference.rst
@@ -31,7 +31,7 @@ although there are some small differences. Most of the time, however,
 you shouldn't be able to notice them::
 
      $ # This works as expected:
-     $ llvmc2 -O3 -Wall hello.cpp
+     $ llvmc -O3 -Wall hello.cpp
      $ ./a.out
      hello
 
@@ -43,7 +43,7 @@ extensions). If you want to force files ending with ".c" to compile as
 C++, use the ``-x`` option, just like you would do it with ``gcc``::
 
       $ # hello.c is really a C++ file
-      $ llvmc2 -x c++ hello.c
+      $ llvmc -x c++ hello.c
       $ ./a.out
       hello
 
@@ -51,10 +51,10 @@ On the other hand, when using LLVMC as a linker to combine several C++
 object files you should provide the ``--linker`` option since it's
 impossible for LLVMC to choose the right linker in that case::
 
-    $ llvmc2 -c hello.cpp
-    $ llvmc2 hello.o
+    $ llvmc -c hello.cpp
+    $ llvmc hello.o
     [A lot of link-time errors skipped]
-    $ llvmc2 --linker=c++ hello.o
+    $ llvmc --linker=c++ hello.o
     $ ./a.out
     hello
 
@@ -138,7 +138,7 @@ directory and run ``make``. The resulting file will be called
 
     $ cd $LLVMC_DIR/plugins/Simple
     $ make
-    $ llvmc2 -load $LLVM_DIR/Release/lib/LLVMCSimple.so
+    $ llvmc -load $LLVM_DIR/Release/lib/LLVMCSimple.so
 
 Sometimes, you will want a 'bare-bones' version of LLVMC that has no
 built-in plugins. It can be compiled with the following command::
@@ -229,7 +229,7 @@ which gets a special treatment - there you are allowed to specify one
 default edge *per language*).
 
 To get a visual representation of the compilation graph (useful for
-debugging), run ``llvmc2 --view-graph``. You will need ``dot`` and
+debugging), run ``llvmc --view-graph``. You will need ``dot`` and
 ``gsview`` installed for this to work properly.
 
 
diff --git a/llvm/tools/llvmc2/doc/LLVMC-Tutorial.rst b/llvm/tools/llvmc/doc/LLVMC-Tutorial.rst
similarity index 97%
rename from llvm/tools/llvmc2/doc/LLVMC-Tutorial.rst
rename to llvm/tools/llvmc/doc/LLVMC-Tutorial.rst
index 724fd4dfacbd376f7d2ec538780d21f2988145ac..d41f90d63490950d49f43a216e9540ddd5941ddd 100644
--- a/llvm/tools/llvmc2/doc/LLVMC-Tutorial.rst
+++ b/llvm/tools/llvmc/doc/LLVMC-Tutorial.rst
@@ -20,7 +20,7 @@ Compiling with LLVMC
 In general, LLVMC tries to be command-line compatible with ``gcc`` as
 much as possible, so most of the familiar options work::
 
-     $ llvmc2 -O3 -Wall hello.cpp
+     $ llvmc -O3 -Wall hello.cpp
      $ ./a.out
      hello
 
@@ -38,7 +38,7 @@ be familiar with it to get anything done.
 Start by compiling ``plugins/Simple/Simple.td``, which is a primitive
 wrapper for ``gcc``::
 
-    $ cd $LLVM_DIR/tools/llvmc2
+    $ cd $LLVM_DIR/tools/llvmc
     $ make DRIVER_NAME=mygcc BUILTIN_PLUGINS=Simple
     $ cat > hello.c
     [...]
@@ -98,4 +98,3 @@ References
 
 .. [1] TableGen Fundamentals
        http://llvm.cs.uiuc.edu/docs/TableGenFundamentals.html
-
diff --git a/llvm/tools/llvmc/doc/Makefile b/llvm/tools/llvmc/doc/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..864376f9d90ada36625c44dd761676700fec4bfc
--- /dev/null
+++ b/llvm/tools/llvmc/doc/Makefile
@@ -0,0 +1,21 @@
+##===- tools/llvmc/doc/Makefile ----------------------------*- Makefile -*-===##
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+
+RST2HTML=rst2html --stylesheet=llvm.css --link-stylesheet
+
+all : LLVMC-Reference.html LLVMC-Tutorial.html
+
+LLVMC-Tutorial.html : LLVMC-Tutorial.rst llvm.css
+	$(RST2HTML) $< $@
+
+LLVMC-Reference.html : LLVMC-Reference.rst llvm.css
+	$(RST2HTML) $< $@
+
+clean :
+	rm *.html
diff --git a/llvm/tools/llvmc2/doc/img/lines.gif b/llvm/tools/llvmc/doc/img/lines.gif
similarity index 100%
rename from llvm/tools/llvmc2/doc/img/lines.gif
rename to llvm/tools/llvmc/doc/img/lines.gif
diff --git a/llvm/tools/llvmc2/doc/llvm.css b/llvm/tools/llvmc/doc/llvm.css
similarity index 100%
rename from llvm/tools/llvmc2/doc/llvm.css
rename to llvm/tools/llvmc/doc/llvm.css
diff --git a/llvm/tools/llvmc2/driver/Action.cpp b/llvm/tools/llvmc/driver/Action.cpp
similarity index 100%
rename from llvm/tools/llvmc2/driver/Action.cpp
rename to llvm/tools/llvmc/driver/Action.cpp
diff --git a/llvm/tools/llvmc2/driver/CMakeLists.txt b/llvm/tools/llvmc/driver/CMakeLists.txt
similarity index 100%
rename from llvm/tools/llvmc2/driver/CMakeLists.txt
rename to llvm/tools/llvmc/driver/CMakeLists.txt
diff --git a/llvm/tools/llvmc2/driver/CompilationGraph.cpp b/llvm/tools/llvmc/driver/CompilationGraph.cpp
similarity index 100%
rename from llvm/tools/llvmc2/driver/CompilationGraph.cpp
rename to llvm/tools/llvmc/driver/CompilationGraph.cpp
diff --git a/llvm/tools/llvmc2/driver/Error.h b/llvm/tools/llvmc/driver/Error.h
similarity index 100%
rename from llvm/tools/llvmc2/driver/Error.h
rename to llvm/tools/llvmc/driver/Error.h
diff --git a/llvm/tools/llvmc2/driver/Makefile b/llvm/tools/llvmc/driver/Makefile
similarity index 88%
rename from llvm/tools/llvmc2/driver/Makefile
rename to llvm/tools/llvmc/driver/Makefile
index 7c04fe4aca4606ff38901fee9109c71ed166f691..d3aa2cd52ad999d65fe24b18b70298916cec4ba8 100644
--- a/llvm/tools/llvmc2/driver/Makefile
+++ b/llvm/tools/llvmc/driver/Makefile
@@ -1,4 +1,4 @@
-##===- tools/llvmc2/src/Makefile ---------------------------*- Makefile -*-===##
+##===- tools/llvmc/driver/Makefile -------------------------*- Makefile -*-===##
 #
 #                     The LLVM Compiler Infrastructure
 #
diff --git a/llvm/tools/llvmc2/driver/Plugin.cpp b/llvm/tools/llvmc/driver/Plugin.cpp
similarity index 98%
rename from llvm/tools/llvmc2/driver/Plugin.cpp
rename to llvm/tools/llvmc/driver/Plugin.cpp
index 17c70869ea6ad947353c2a473f769e708b70423c..75abbd041d32cfa5d007a60b630ab4b1b20f43c2 100644
--- a/llvm/tools/llvmc2/driver/Plugin.cpp
+++ b/llvm/tools/llvmc/driver/Plugin.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-//  Plugin support for llvmc2.
+//  Plugin support.
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/llvm/tools/llvmc2/driver/llvmc.cpp b/llvm/tools/llvmc/driver/llvmc.cpp
similarity index 100%
rename from llvm/tools/llvmc2/driver/llvmc.cpp
rename to llvm/tools/llvmc/driver/llvmc.cpp
diff --git a/llvm/tools/llvmc2/plugins/Base/Base.td b/llvm/tools/llvmc/plugins/Base/Base.td
similarity index 100%
rename from llvm/tools/llvmc2/plugins/Base/Base.td
rename to llvm/tools/llvmc/plugins/Base/Base.td
diff --git a/llvm/tools/llvmc2/plugins/Base/Makefile b/llvm/tools/llvmc/plugins/Base/Makefile
similarity index 84%
rename from llvm/tools/llvmc2/plugins/Base/Makefile
rename to llvm/tools/llvmc/plugins/Base/Makefile
index c1579d146d1fbad853a726f71f847286c4a95a57..5ca6048508a177e7cd7e09c886093fd980b70cb2 100644
--- a/llvm/tools/llvmc2/plugins/Base/Makefile
+++ b/llvm/tools/llvmc/plugins/Base/Makefile
@@ -1,4 +1,4 @@
-##===- tools/llvmc2/plugins/Base/Makefile ------------------*- Makefile -*-===##
+##===- tools/llvmc/plugins/Base/Makefile -------------------*- Makefile -*-===##
 #
 #                     The LLVM Compiler Infrastructure
 #
diff --git a/llvm/tools/llvmc2/plugins/Base/PluginMain.cpp b/llvm/tools/llvmc/plugins/Base/PluginMain.cpp
similarity index 100%
rename from llvm/tools/llvmc2/plugins/Base/PluginMain.cpp
rename to llvm/tools/llvmc/plugins/Base/PluginMain.cpp
diff --git a/llvm/tools/llvmc2/plugins/Clang/Clang.td b/llvm/tools/llvmc/plugins/Clang/Clang.td
similarity index 99%
rename from llvm/tools/llvmc2/plugins/Clang/Clang.td
rename to llvm/tools/llvmc/plugins/Clang/Clang.td
index ee6987fa352fca874081526a3ea18f6fb0007427..0f5d8cd91808e62f0ebfe104b79bf626106973a4 100644
--- a/llvm/tools/llvmc2/plugins/Clang/Clang.td
+++ b/llvm/tools/llvmc/plugins/Clang/Clang.td
@@ -83,4 +83,3 @@ def CompilationGraph : CompilationGraph<[
     Edge<"clang_cpp", "llvm_ld">,
     Edge<"clang_objective_c", "llvm_ld">
     ]>;
-
diff --git a/llvm/tools/llvmc2/plugins/Clang/Makefile b/llvm/tools/llvmc/plugins/Clang/Makefile
similarity index 84%
rename from llvm/tools/llvmc2/plugins/Clang/Makefile
rename to llvm/tools/llvmc/plugins/Clang/Makefile
index 237cc736f0f4c92fc98d42cdf917a018664e0caa..32060138c233bd992adf552a04250537ce9ac502 100644
--- a/llvm/tools/llvmc2/plugins/Clang/Makefile
+++ b/llvm/tools/llvmc/plugins/Clang/Makefile
@@ -1,4 +1,4 @@
-##===- tools/llvmc2/plugins/Clang/Makefile -----------------*- Makefile -*-===##
+##===- tools/llvmc/plugins/Clang/Makefile ------------------*- Makefile -*-===##
 #
 #                     The LLVM Compiler Infrastructure
 #
@@ -11,4 +11,3 @@ LLVMC_PLUGIN = Clang
 BUILT_SOURCES = AutoGenerated.inc
 
 include ../Makefile
-
diff --git a/llvm/tools/llvmc2/plugins/Clang/PluginMain.cpp b/llvm/tools/llvmc/plugins/Clang/PluginMain.cpp
similarity index 100%
rename from llvm/tools/llvmc2/plugins/Clang/PluginMain.cpp
rename to llvm/tools/llvmc/plugins/Clang/PluginMain.cpp
diff --git a/llvm/tools/llvmc2/plugins/Hello/Hello.cpp b/llvm/tools/llvmc/plugins/Hello/Hello.cpp
similarity index 99%
rename from llvm/tools/llvmc2/plugins/Hello/Hello.cpp
rename to llvm/tools/llvmc/plugins/Hello/Hello.cpp
index eb52d249f0b43d3c4872de3de94fc418db7e1293..2ecd2f1c5b9b40f76067955cbb1b70a5f2d6d09a 100644
--- a/llvm/tools/llvmc2/plugins/Hello/Hello.cpp
+++ b/llvm/tools/llvmc/plugins/Hello/Hello.cpp
@@ -28,5 +28,3 @@ struct MyPlugin : public llvmc::BasePlugin {
 static llvmc::RegisterPlugin<MyPlugin> RP("Hello", "Hello World plugin");
 
 }
-
-
diff --git a/llvm/tools/llvmc2/plugins/Hello/Makefile b/llvm/tools/llvmc/plugins/Hello/Makefile
similarity index 83%
rename from llvm/tools/llvmc2/plugins/Hello/Makefile
rename to llvm/tools/llvmc/plugins/Hello/Makefile
index f0d51ddbfcbb0a828094f663284659f9e5f84565..181dd0c605082c9dbf62581f9e23af9193c65ad5 100644
--- a/llvm/tools/llvmc2/plugins/Hello/Makefile
+++ b/llvm/tools/llvmc/plugins/Hello/Makefile
@@ -1,4 +1,4 @@
-##===- tools/llvmc2/plugins/Hello/Makefile -----------------*- Makefile -*-===##
+##===- tools/llvmc/plugins/Hello/Makefile ------------------*- Makefile -*-===##
 #
 #                     The LLVM Compiler Infrastructure
 #
diff --git a/llvm/tools/llvmc2/plugins/Makefile b/llvm/tools/llvmc/plugins/Makefile
similarity index 94%
rename from llvm/tools/llvmc2/plugins/Makefile
rename to llvm/tools/llvmc/plugins/Makefile
index 041b045652cb09b84bdaa7dfea723fdecbab5844..dab58e07581d8f6cb36b68bb386e8a5def4aa052 100644
--- a/llvm/tools/llvmc2/plugins/Makefile
+++ b/llvm/tools/llvmc/plugins/Makefile
@@ -1,4 +1,4 @@
-##===- tools/llvmc2/plugins/Makefile.plugins ----------------*- Makefile -*-===##
+##===- tools/llvmc/plugins/Makefile.plugins ----------------*- Makefile -*-===##
 #
 #                     The LLVM Compiler Infrastructure
 #
diff --git a/llvm/tools/llvmc2/plugins/Simple/Makefile b/llvm/tools/llvmc/plugins/Simple/Makefile
similarity index 80%
rename from llvm/tools/llvmc2/plugins/Simple/Makefile
rename to llvm/tools/llvmc/plugins/Simple/Makefile
index 4a1625666536cb13b48c435224789653a8cecb73..1cd5af7a15e6443c02e5d3e6caf69296a9816274 100644
--- a/llvm/tools/llvmc2/plugins/Simple/Makefile
+++ b/llvm/tools/llvmc/plugins/Simple/Makefile
@@ -1,4 +1,4 @@
-##===- tools/llvmc2/plugins/Simple/Makefile ------------------*- Makefile -*-===##
+##===- tools/llvmc/plugins/Simple/Makefile -----------------*- Makefile -*-===##
 #
 #                     The LLVM Compiler Infrastructure
 #
diff --git a/llvm/tools/llvmc2/plugins/Simple/PluginMain.cpp b/llvm/tools/llvmc/plugins/Simple/PluginMain.cpp
similarity index 100%
rename from llvm/tools/llvmc2/plugins/Simple/PluginMain.cpp
rename to llvm/tools/llvmc/plugins/Simple/PluginMain.cpp
diff --git a/llvm/tools/llvmc2/plugins/Simple/Simple.td b/llvm/tools/llvmc/plugins/Simple/Simple.td
similarity index 100%
rename from llvm/tools/llvmc2/plugins/Simple/Simple.td
rename to llvm/tools/llvmc/plugins/Simple/Simple.td
diff --git a/llvm/tools/llvmc2/doc/Makefile b/llvm/tools/llvmc2/doc/Makefile
deleted file mode 100644
index c71f6625ad616e0b2f5b1b4361b73a2bc5bf90f3..0000000000000000000000000000000000000000
--- a/llvm/tools/llvmc2/doc/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-RST2HTML=rst2html --stylesheet=llvm.css --link-stylesheet
-
-all : LLVMC-Reference.html LLVMC-Tutorial.html
-
-LLVMC-Tutorial.html : LLVMC-Tutorial.rst llvm.css
-	$(RST2HTML) $< $@
-
-LLVMC-Reference.html : LLVMC-Reference.rst llvm.css
-	$(RST2HTML) $< $@
-
-clean :
-	rm *.html