diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index e8218aed417ed..36822a56a18fd 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -145,6 +145,7 @@ TAO_CodeGen::start_client_header (const char *fname)
       return -1;
     }
 
+  gen_generated_from_comment (this->client_header_);
   TAO_INSERT_COMMENT (this->client_header_);
 
   // Generate the #ident string, if any.
@@ -369,6 +370,7 @@ TAO_CodeGen::start_client_stubs (const char *fname)
       return -1;
     }
 
+  gen_generated_from_comment (this->client_stubs_);
   TAO_INSERT_COMMENT (this->client_stubs_);
 
   this->gen_stub_src_includes ();
@@ -451,6 +453,7 @@ TAO_CodeGen::start_server_header (const char *fname)
       return -1;
     }
 
+  gen_generated_from_comment (this->server_header_);
   TAO_INSERT_COMMENT (this->server_header_);
 
   // Generate the ident string, if any.
@@ -577,6 +580,7 @@ TAO_CodeGen::start_server_template_header (const char *fname)
       return -1;
     }
 
+  gen_generated_from_comment (this->server_template_header_);
   TAO_INSERT_COMMENT (this->server_template_header_);
 
   // Generate the ident string, if any.
@@ -628,6 +632,7 @@ TAO_CodeGen::start_server_skeletons (const char *fname)
       return -1;
     }
 
+  gen_generated_from_comment (this->server_skeletons_);
   TAO_INSERT_COMMENT (this->server_skeletons_);
 
   // Generate the ident string, if any.
@@ -688,6 +693,7 @@ TAO_CodeGen::start_server_template_skeletons (const char *fname)
       return -1;
     }
 
+  gen_generated_from_comment (this->server_template_skeletons_);
   TAO_INSERT_COMMENT (this->server_template_skeletons_);
 
   // Generate the ident string, if any.
@@ -764,6 +770,7 @@ TAO_CodeGen::start_anyop_header (const char *fname)
       return 0;
     }
 
+  gen_generated_from_comment (this->anyop_header_);
   TAO_INSERT_COMMENT (this->anyop_header_);
 
   // Generate the #ident string, if any.
@@ -996,6 +1003,7 @@ TAO_CodeGen::start_ciao_svnt_header (const char *fname)
 
   TAO_OutStream &os = *this->ciao_svnt_header_;
 
+  gen_generated_from_comment (&os);
   TAO_INSERT_COMMENT (&os);
 
   // Generate the #ident string, if any.
@@ -1096,6 +1104,7 @@ TAO_CodeGen::start_ciao_svnt_source (const char *fname)
 
   TAO_OutStream &os = *this->ciao_svnt_source_;
 
+  gen_generated_from_comment (&os);
   TAO_INSERT_COMMENT (&os);
 
   // Generate the #ident string, if any.
@@ -1136,6 +1145,7 @@ TAO_CodeGen::start_ciao_svnt_template_header (const char *fname)
 
   TAO_OutStream &os = *this->ciao_svnt_template_header_;
 
+  gen_generated_from_comment (&os);
   TAO_INSERT_COMMENT (&os);
 
   // Generate the #ident string, if any.
@@ -1215,6 +1225,7 @@ TAO_CodeGen::start_ciao_svnt_template_source (const char *fname)
 
   TAO_OutStream &os = *this->ciao_svnt_template_source_;
 
+  gen_generated_from_comment (&os);
   TAO_INSERT_COMMENT (&os);
 
   // Generate the #ident string, if any.
@@ -1419,6 +1430,7 @@ TAO_CodeGen::start_ciao_conn_header (const char *fname)
 
   TAO_OutStream &os = *this->ciao_conn_header_;
 
+  gen_generated_from_comment (&os);
   TAO_INSERT_COMMENT (&os);
 
   // Generate the #ident string, if any.
@@ -1488,6 +1500,7 @@ TAO_CodeGen::start_ciao_conn_source (const char *fname)
 
   TAO_OutStream &os = *this->ciao_conn_source_;
 
+  gen_generated_from_comment (&os);
   TAO_INSERT_COMMENT (&os);
 
   // Generate the #ident string, if any.
@@ -1564,6 +1577,7 @@ TAO_CodeGen::start_implementation_header (const char *fname)
       return -1;
     }
 
+  gen_generated_from_comment (this->implementation_header_);
   TAO_INSERT_COMMENT (this->implementation_header_);
 
   // Generate the ident string, if any.
@@ -1618,6 +1632,7 @@ TAO_CodeGen::start_implementation_skeleton (const char *fname)
       return -1;
     }
 
+  gen_generated_from_comment (this->implementation_skeleton_);
   TAO_INSERT_COMMENT (this->implementation_skeleton_);
 
   // Generate the ident string, if any.
@@ -3814,3 +3829,9 @@ TAO_CodeGen::destroy ()
   delete this->gperf_input_stream_;
   delete [] this->gperf_input_filename_;
 }
+
+void
+TAO_CodeGen::gen_generated_from_comment (TAO_OutStream *stream)
+{
+  *stream << "// Generated from: " << idl_global->filename ()->get_string () << "\n";
+}
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
index 462657a06d538..75c61b8b420f3 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/be_codegen.h
@@ -391,6 +391,8 @@ class TAO_IDL_BE_Export TAO_CodeGen
                              const char *included_file,
                              bool add_comment = false);
 
+  void gen_generated_from_comment (TAO_OutStream *stream);
+
   /// Cleanup.
   void destroy ();