6 files changed, 16 insertions, 6 deletions
diff --git a/src/bug.adb b/src/bug.adb
index f7b44210f..0c2c5d5fd 100644
--- a/src/bug.adb
+++ b/src/bug.adb
@@ -70,7 +70,8 @@ package body Bug is
       Put_Line
         (Standard_Error,
          "Please report this bug on https://github.com/tgingold/ghdl/issues");
-      Put_Line (Standard_Error, "GHDL release: " & Ghdl_Release);
+      Put_Line (Standard_Error,
+                "GHDL release: " & Ghdl_Ver & ' ' & Ghdl_Release);
       Put_Line (Standard_Error, "Compiled with " & Get_Gnat_Version);
       Put_Line (Standard_Error, "Target: " & Standard'Target_Name);
       Put_Line (Standard_Error, "In directory: " &
diff --git a/src/ghdldrv/ghdlcomp.adb b/src/ghdldrv/ghdlcomp.adb
index 56487b863..b20d12ac2 100644
--- a/src/ghdldrv/ghdlcomp.adb
+++ b/src/ghdldrv/ghdlcomp.adb
@@ -745,7 +745,9 @@ package body Ghdlcomp is
       Files_List := Build_Dependence (Prim_Name, Sec_Name);
 
       Put_Line ("# Makefile automatically generated by ghdl");
-      Put ("# Version: ");
+      Put ("# Version: GHDL ");
+      Put (Version.Ghdl_Ver);
+      Put (' ');
       Put (Version.Ghdl_Release);
       Put (" - ");
       if Version_String /= null then
diff --git a/src/ghdldrv/ghdldrv.adb b/src/ghdldrv/ghdldrv.adb
index 03861f793..2d3342b1b 100644
--- a/src/ghdldrv/ghdldrv.adb
+++ b/src/ghdldrv/ghdldrv.adb
@@ -1752,7 +1752,9 @@ package body Ghdldrv is
       Files_List := Build_Dependence (Prim_Name, Sec_Name);
 
       Put_Line ("# Makefile automatically generated by ghdl");
-      Put ("# Version: ");
+      Put ("# Version: GHDL ");
+      Put (Version.Ghdl_Ver);
+      Put (' ');
       Put (Version.Ghdl_Release);
       Put (" - ");
       if Version_String /= null then
diff --git a/src/ghdldrv/ghdlmain.adb b/src/ghdldrv/ghdlmain.adb
index abe7dc045..841d6ccc5 100644
--- a/src/ghdldrv/ghdlmain.adb
+++ b/src/ghdldrv/ghdlmain.adb
@@ -223,6 +223,9 @@ package body Ghdlmain is
       pragma Unreferenced (Cmd);
       use Ada.Text_IO;
    begin
+      Put ("GHDL ");
+      Put (Version.Ghdl_Ver);
+      Put (' ');
       Put_Line (Version.Ghdl_Release);
       Put_Line (" Compiled with " & Bug.Get_Gnat_Version);
       if Version_String /= null then
diff --git a/src/ghdldrv/ghdlprint.adb b/src/ghdldrv/ghdlprint.adb
index a19085527..0ace5ae50 100644
--- a/src/ghdldrv/ghdlprint.adb
+++ b/src/ghdldrv/ghdlprint.adb
@@ -506,7 +506,9 @@ package body Ghdlprint is
    begin
       Put_Line ("<p>");
       Put ("<small>This page was generated using ");
-      Put ("<a href=""http://ghdl.free.fr"">");
+      Put ("<a href=""http://ghdl.free.fr"">GHDL ");
+      Put (Version.Ghdl_Ver);
+      Put (' ');
       Put (Version.Ghdl_Release);
       Put ("</a>, a program written by");
       Put (" Tristan Gingold");
diff --git a/src/version.in b/src/version.in
index 4593dab24..dca48760f 100644
--- a/src/version.in
+++ b/src/version.in
@@ -1,5 +1,5 @@
 package Version is
-   Ghdl_Release : constant String :=
-      "GHDL 0.35-dev (tarball) [Dunoon edition]";
    Ghdl_Ver : constant String := "0.35-dev";
+   Ghdl_Release : constant String :=
+      "(tarball) [Dunoon edition]";
 end Version;