diff --git a/.gitattributes b/.gitattributes
index 0af50f3cf9..0637dbdff4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -822,7 +822,6 @@ packager/ucomponentmanmain.pas svneol=native#text/pascal
 packager/ufrmaddcomponent.lfm svneol=native#text/plain
 packager/ufrmaddcomponent.lrs svneol=native#text/pascal
 packager/ufrmaddcomponent.pas svneol=native#text/pascal
-tools/RunAndWait.sh -text svneol=native#application/x-sh
 tools/apiwizz/apiwizard.pp svneol=native#text/pascal
 tools/apiwizz/apiwizz.pp svneol=native#text/pascal
 tools/install/create_fpc_export_tgz.sh -text svneol=native#application/x-sh
diff --git a/components/codetools/definetemplates.pas b/components/codetools/definetemplates.pas
index 0056a4f1e1..9c404577ae 100644
--- a/components/codetools/definetemplates.pas
+++ b/components/codetools/definetemplates.pas
@@ -2382,7 +2382,8 @@ begin
     +';'+Dir+'rtl'+DS+'objpas'+DS
     +';'+Dir+'rtl'+DS+'inc'+DS
     +';'+Dir+'rtl'+DS+TargetProcessor+DS
-    +';'+Dir+'rtl'+DS+SrcOS+DS;
+    +';'+Dir+'rtl'+DS+SrcOS+DS
+    +';'+Dir+'rtl'+DS+SrcOS+DS+TargetProcessor+DS;
   if (TargetOS<>'') and (TargetOS<>SrcOS) then
     s:=s+';'+Dir+'rtl'+DS+TargetOS+DS;
   RTLDir.AddChild(TDefineTemplate.Create('Include Path',
diff --git a/ide/runparamsopts.pas b/ide/runparamsopts.pas
index 7219937707..618bf4c1a5 100644
--- a/ide/runparamsopts.pas
+++ b/ide/runparamsopts.pas
@@ -171,7 +171,7 @@ implementation
 const
   DefaultLauncherApplication =
     '/usr/X11R6/bin/xterm -T ''Lazarus Run Output'''
-    +' -e $(LazarusDir)/tools/RunAndWait.sh $(TargetCmdLine)';
+    +' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)';
 
 function ShowRunParamsOptsDlg(RunParamsOptions: TRunParamsOptions):TModalResult;
 var
@@ -457,7 +457,7 @@ begin
       Items.Add(DefaultLauncherApplication);
       {$IFNDEF win32}
       Items.Add('/usr/bin/gnome-terminal -t ''Lazarus Run Output'''
-               +' -e ''$(LazarusDir)/tools/RunAndWait.sh $(TargetCmdLine)''');
+               +' -e ''$(LazarusDir)/tools/runwait.sh $(TargetCmdLine)''');
       {$ENDIF}
       EndUpdate;
     end;
diff --git a/tools/RunAndWait.sh b/tools/RunAndWait.sh
deleted file mode 100644
index 1277953bdf..0000000000
--- a/tools/RunAndWait.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-CommandLine=$@
-#set -x
-
-echo $CommandLine
-$CommandLine
-echo "--------------------------------------------------"
-echo "Press enter"
-read
-
-# end.