diff --git a/lib/VMCore/Function.cpp b/lib/VMCore/Function.cpp
index d0479a95db3..0babc55eb90 100644
--- a/lib/VMCore/Function.cpp
+++ b/lib/VMCore/Function.cpp
@@ -357,9 +357,9 @@ std::string Intrinsic::getName(ID id, ArrayRef<Type*> Tys) {
   return Result;
 }
 
-#define GET_INTRINSTIC_GENERATOR_GLOBAL
+#define GET_INTRINSIC_GENERATOR_GLOBAL
 #include "llvm/Intrinsics.gen"
-#undef GET_INTRINSTIC_GENERATOR_GLOBAL
+#undef GET_INTRINSIC_GENERATOR_GLOBAL
 
 static Type *DecodeFixedType(unsigned &NextElt, ArrayRef<unsigned char> Infos,
                              ArrayRef<Type*> Tys, LLVMContext &Context) {
diff --git a/utils/TableGen/IntrinsicEmitter.cpp b/utils/TableGen/IntrinsicEmitter.cpp
index 2a22c974a93..226d9071aa3 100644
--- a/utils/TableGen/IntrinsicEmitter.cpp
+++ b/utils/TableGen/IntrinsicEmitter.cpp
@@ -470,7 +470,7 @@ void printIITEntry(raw_ostream &OS, unsigned char X) {
 void IntrinsicEmitter::EmitGenerator(const std::vector<CodeGenIntrinsic> &Ints, 
                                      raw_ostream &OS) {
   OS << "// Global intrinsic function declaration type table.\n";
-  OS << "#ifdef GET_INTRINSTIC_GENERATOR_GLOBAL\n";
+  OS << "#ifdef GET_INTRINSIC_GENERATOR_GLOBAL\n";
   // NOTE: These enums must be kept in sync with the ones above!
   OS << "enum IIT_Info {\n";
   OS << "  IIT_Done = 0,\n";
@@ -575,7 +575,7 @@ void IntrinsicEmitter::EmitGenerator(const std::vector<CodeGenIntrinsic> &Ints,
     LongEncodingTable.emit(OS, printIITEntry);
   OS << "  255\n};\n\n";
   
-  OS << "#endif\n\n";  // End of GET_INTRINSTIC_GENERATOR_GLOBAL
+  OS << "#endif\n\n";  // End of GET_INTRINSIC_GENERATOR_GLOBAL
 }
 
 namespace {