diff --git a/compiler/cpp/src/generate/t_delphi_generator.cc b/compiler/cpp/src/generate/t_delphi_generator.cc
index 148d284..9395457 100644
--- a/compiler/cpp/src/generate/t_delphi_generator.cc
+++ b/compiler/cpp/src/generate/t_delphi_generator.cc
@@ -149,7 +149,7 @@
     virtual std::string autogen_comment() {
       return
         std::string("(**\n") +
-        " * Autogenerated by Thrift\n" +
+        " * Autogenerated by Thrift Compiler (" + THRIFT_VERSION + ")\n" +
         " *\n" +
         " * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING\n" +
         " *)\n";
diff --git a/lib/delphi/src/Thrift.pas b/lib/delphi/src/Thrift.pas
index 48c3d47..a1c959d 100644
--- a/lib/delphi/src/Thrift.pas
+++ b/lib/delphi/src/Thrift.pas
@@ -24,6 +24,9 @@
 uses
   SysUtils, Thrift.Protocol;
 
+const
+  Version = '0.8.0-dev';
+	
 type
   IProcessor = interface
     ['{B1538A07-6CAC-4406-8A4C-AFED07C70A89}']
diff --git a/lib/delphi/test/client.dpr b/lib/delphi/test/client.dpr
index d0152bf..d14079d 100644
--- a/lib/delphi/test/client.dpr
+++ b/lib/delphi/test/client.dpr
@@ -44,6 +44,7 @@
 
 begin
   try
+    Writeln( 'Delphi TestClient '+Thrift.Version);
     nParamCount := ParamCount;
     SetLength( args, nParamCount);
     for i := 1 to nParamCount do
diff --git a/lib/delphi/test/server.dpr b/lib/delphi/test/server.dpr
index 768de01..d6a53bc 100644
--- a/lib/delphi/test/server.dpr
+++ b/lib/delphi/test/server.dpr
@@ -43,6 +43,7 @@
 
 begin
   try
+    Writeln( 'Delphi TestServer '+Thrift.Version);
     nParamCount := ParamCount;
     SetLength( args, nParamCount);
     for i := 1 to nParamCount do