diff --git a/compiler/cpp/src/generate/t_cpp_generator.cc b/compiler/cpp/src/generate/t_cpp_generator.cc
index 3871e05..adb1028 100644
--- a/compiler/cpp/src/generate/t_cpp_generator.cc
+++ b/compiler/cpp/src/generate/t_cpp_generator.cc
@@ -160,6 +160,9 @@
     endl <<
     "};" << endl <<
     endl;
+
+  generate_local_reflection(f_types_, tenum, false);
+  generate_local_reflection(f_types_impl_, tenum, true);
 }
 
 /**
@@ -2869,12 +2872,11 @@
   //               and put them in Thrift.{h,cpp} ?
 
   if (ttype->is_base_type()) {
-    //name = ttype->get_name();
     prog = program_->get_name();
     name = ttype->get_ascii_fingerprint();
   } else if (ttype->is_enum()) {
-    //name = "enum";
-    prog = program_->get_name();
+    assert(ttype->get_program() != NULL);
+    prog = ttype->get_program()->get_name();
     name = ttype->get_ascii_fingerprint();
   } else if (ttype->is_container()) {
     prog = program_->get_name();
diff --git a/compiler/cpp/src/main.cc b/compiler/cpp/src/main.cc
index 9f3eb73..b2aaeb4 100644
--- a/compiler/cpp/src/main.cc
+++ b/compiler/cpp/src/main.cc
@@ -560,7 +560,7 @@
 }
 
 /**
- * Call generate_fingerprint for every structure.
+ * Call generate_fingerprint for every structure and enum.
  */
 void generate_all_fingerprints(t_program* program) {
   const vector<t_struct*>& structs = program->get_structs();
@@ -577,6 +577,13 @@
     st->generate_fingerprint();
   }
 
+  const vector<t_enum*>& enums = program->get_enums();
+  vector<t_enum*>::const_iterator e_iter;
+  for (e_iter = enums.begin(); e_iter != enums.end(); ++e_iter) {
+    t_enum* e = *e_iter;
+    e->generate_fingerprint();
+  }
+
   g_type_void->generate_fingerprint();
 
   // If you want to generate fingerprints for implicit structures, start here.