diff --git a/C/save.c b/C/save.c
index a3589aae5..679446bff 100644
--- a/C/save.c
+++ b/C/save.c
@@ -1184,7 +1184,7 @@ commit_to_saved_state(char *s, CELL *Astate, CELL *ATrail, CELL *AStack, CELL *A
   if (Yap_HeapBase) {
     if (!yap_flags[HALT_AFTER_CONSULT_FLAG]) {
       Yap_TrueFileName(s,Yap_FileNameBuf2, YAP_FILENAME_MAX);
-      fprintf(Yap_stderr, "[ Restoring file %s ]\n", Yap_FileNameBuf2);
+      fprintf(stderr, "[ Restoring file %s ]\n", Yap_FileNameBuf2);
     }
     Yap_CloseStreams(TRUE);
   }
diff --git a/pl/boot.yap b/pl/boot.yap
index 6370ed42c..f91d777f5 100644
--- a/pl/boot.yap
+++ b/pl/boot.yap
@@ -177,10 +177,10 @@ read_sig.
 
 '$version' :- 
 	get_value('$version_name',VersionName),
-	'$format'(user_error, '[ YAP version ~w ]~n', [VersionName]),
+	'$print_message'(help, version(VersionName)),
 	fail.
 '$version' :- recorded('$version',VersionName,_),
-	'$format'(user_error, '~w~n', [VersionName]),
+	'$print_message'(help, VersionName),
 	fail.
 '$version'.
 
diff --git a/pl/errors.yap b/pl/errors.yap
index def0216d1..ea9851378 100644
--- a/pl/errors.yap
+++ b/pl/errors.yap
@@ -142,6 +142,8 @@ print_message(Level, Mss) :-
 '$do_print_message'(breakpoints(L)) :- !,
 	'$format'(user_error,'Spy-points set on:', []),
 	'$print_list_of_preds'(L).
+'$do_print_message'(version(Version)) :- !,
+	'$format'(user_error,'YAP version ~a', [Version]).
 '$do_print_message'(Messg) :-
 	'$format'(user_error,'~q',Messg).