diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 314aeffd262d..cdc6c0476256 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2015-05-22  Arnaud Charlet  <charlet@adacore.com>
+
+	* osint-c.adb, osint-c.ads (Set_File_Name): Move back to spec.
+
+2015-05-22  Pascal Obry  <obry@adacore.com>
+
+	* prj-util.adb: Minor comment editing.
+
 2015-05-22  Pascal Obry  <obry@adacore.com>
 
 	* makeutl.ads (In_Place_Option): New constant.
diff --git a/gcc/ada/osint-c.adb b/gcc/ada/osint-c.adb
index 6f53ae366e83..33e0a92a1392 100644
--- a/gcc/ada/osint-c.adb
+++ b/gcc/ada/osint-c.adb
@@ -45,13 +45,6 @@ package body Osint.C is
    --  output file and Suffix is the desired suffix (dg/rep/xxx for debug/
    --  repinfo/list file where xxx is specified extension.
 
-   procedure Set_File_Name (Ext : String);
-   --  Sets a default file name from the main compiler source name. Ext is
-   --  the extension, e.g. "ali" for a library information file. Used by
-   --  Create_Output_Library_Info, and by the version of Read_Library_Info that
-   --  takes a default file name, and also by Create_C_File and Create_H_File.
-   --  The name is in Name_Buffer (with length in Name_Len) on return.
-
    ------------------
    -- Close_C_File --
    ------------------
diff --git a/gcc/ada/osint-c.ads b/gcc/ada/osint-c.ads
index 550d4e58a71b..177d1f15ffb3 100644
--- a/gcc/ada/osint-c.ads
+++ b/gcc/ada/osint-c.ads
@@ -127,6 +127,11 @@ package Osint.C is
    --  returned by Next_Main_Source) for appending. This is used to append
    --  the globals computed in flow analysis in gnatprove mode.
 
+   procedure Set_File_Name (Ext : String);
+   --  Sets a default file name from the main compiler source name. Ext is
+   --  the extension, e.g. "ali" for a library information file.
+   --  The name is in Name_Buffer (with length in Name_Len) on return.
+
    procedure Write_Library_Info (Info : String);
    --  Writes the contents of the referenced string to the library information
    --  file for the main source file currently being compiled (i.e. the file
diff --git a/gcc/ada/prj-util.adb b/gcc/ada/prj-util.adb
index 77e26d62f63f..3f3b358311e6 100644
--- a/gcc/ada/prj-util.adb
+++ b/gcc/ada/prj-util.adb
@@ -806,7 +806,7 @@ package body Prj.Util is
 
    function Relative_Path (Pathname : String; To : String) return String is
       function Ensure_Directory (Path : String) return String;
-      --  Function spec must be commented ???
+      --  Returns Path with an added directory separator if needed
 
       ----------------------
       -- Ensure_Directory --