diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c
index 126f2f4cb31..2fa513c652e 100644
--- a/base/shell/cmd/cmd.c
+++ b/base/shell/cmd/cmd.c
@@ -2299,11 +2299,15 @@ Initialize(VOID)
     if (!*ptr)
     {
         /* If neither /C or /K was given, display a simple version string */
-        ConOutChar(_T('\n'));
+
+        /* Insert a new line above the copyright notice if we are drawing the information line. */
+        if (HasInfoLine())
+            ConOutChar('\n');
+
         ConOutResPrintf(STRING_REACTOS_VERSION,
                         _T(KERNEL_VERSION_STR),
                         _T(KERNEL_VERSION_BUILD_STR));
-        ConOutPuts(_T("(C) Copyright 1998-") _T(COPYRIGHT_YEAR) _T(" ReactOS Team.\n"));
+        ConOutResPrintf(STRING_CMD_COPYRIGHT, _T(COPYRIGHT_YEAR));
     }
 
     if (AutoRun)
diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h
index 0812596719b..d07f98301ea 100644
--- a/base/shell/cmd/cmd.h
+++ b/base/shell/cmd/cmd.h
@@ -434,6 +434,7 @@ INT cmd_path (LPTSTR);
 VOID InitPrompt (VOID);
 VOID PrintPrompt (VOID);
 INT  cmd_prompt (LPTSTR);
+BOOL HasInfoLine(VOID);
 
 /* Prototypes for REDIR.C */
 HANDLE GetHandle(UINT Number);
diff --git a/base/shell/cmd/lang/cs-CZ.rc b/base/shell/cmd/lang/cs-CZ.rc
index 301cb262409..7cd4890fd4c 100644
--- a/base/shell/cmd/lang/cs-CZ.rc
+++ b/base/shell/cmd/lang/cs-CZ.rc
@@ -532,6 +532,7 @@ title         new title\n"
     STRING_REPLACE_ERROR6 "Nebyly nazeleny žádné soubory - %s\n"
     STRING_REPLACE_ERROR7 "Rozšířená chyba 32\n"
     STRING_CMD_INFOLINE "  ReactOS Příkazový řádek                              Napsání HELP = Nápověda  "
+    STRING_CMD_COPYRIGHT "(C) Copyright 1996-%s ReactOS Team.\n"
     STRING_REACTOS_VERSION "ReactOS [Verze %s %s]\n"
     STRING_CMD_SHELLINFO "\nReactOS Interpret příkazového řádku\nVerze %s %s"
     STRING_VERSION_RUNNING_ON "Běží na: "
diff --git a/base/shell/cmd/lang/de-DE.rc b/base/shell/cmd/lang/de-DE.rc
index b6a1b9c0d9a..50645880d4a 100644
--- a/base/shell/cmd/lang/de-DE.rc
+++ b/base/shell/cmd/lang/de-DE.rc
@@ -528,6 +528,7 @@ Titel         neuer Titel"
     STRING_REPLACE_ERROR6 "Keine Dateien gefunden - %s\n"
     STRING_REPLACE_ERROR7 "Erweiterter Fehler 32\n"
     STRING_CMD_INFOLINE "  ReactOS Eingabeaufforderung                            HELP eingeben = Hilfe  "
+    STRING_CMD_COPYRIGHT "(C) Copyright 1996-%s ReactOS Team.\n"
     STRING_REACTOS_VERSION "ReactOS [Version %s %s]\n"
     STRING_CMD_SHELLINFO "\nReactOS Eingabeaufforderung\nVersion %s %s"
     STRING_VERSION_RUNNING_ON "Läuft in: "
diff --git a/base/shell/cmd/lang/el-GR.rc b/base/shell/cmd/lang/el-GR.rc
index f5711d1452c..a12fe5b93f4 100644
--- a/base/shell/cmd/lang/el-GR.rc
+++ b/base/shell/cmd/lang/el-GR.rc
@@ -531,6 +531,7 @@ title         new title\n"
     STRING_REPLACE_ERROR6 "Δε βρέθηκαν αρχεία - %s\n"
     STRING_REPLACE_ERROR7 "Extended Error 32\n"
     STRING_CMD_INFOLINE "  ReactOS Command Prompt                                      Type HELP = Help  "
+    STRING_CMD_COPYRIGHT "(C) Copyright 1996-%s ReactOS Team.\n"
     STRING_REACTOS_VERSION "ReactOS [Version %s %s]\n"
     STRING_CMD_SHELLINFO "\nReactOS Command Line Interpreter\nVersion %s %s"
     STRING_VERSION_RUNNING_ON "Running on: "
diff --git a/base/shell/cmd/lang/en-US.rc b/base/shell/cmd/lang/en-US.rc
index c48c8c6cdd0..f52a680072e 100644
--- a/base/shell/cmd/lang/en-US.rc
+++ b/base/shell/cmd/lang/en-US.rc
@@ -527,6 +527,7 @@ title         new title\n"
     STRING_REPLACE_ERROR6 "No files found - %s\n"
     STRING_REPLACE_ERROR7 "Extended Error 32\n"
     STRING_CMD_INFOLINE "  ReactOS Command Prompt                                      Type HELP = Help  "
+    STRING_CMD_COPYRIGHT "(C) Copyright 1996-%s ReactOS Team.\n"
     STRING_REACTOS_VERSION "ReactOS [Version %s %s]\n"
     STRING_CMD_SHELLINFO "\nReactOS Command Line Interpreter\nVersion %s %s"
     STRING_VERSION_RUNNING_ON "Running on: "
diff --git a/base/shell/cmd/lang/es-ES.rc b/base/shell/cmd/lang/es-ES.rc
index 690cbdf270b..9622df4df8b 100644
--- a/base/shell/cmd/lang/es-ES.rc
+++ b/base/shell/cmd/lang/es-ES.rc
@@ -535,6 +535,7 @@ title         Nuevo título\n"
     STRING_REPLACE_ERROR6 "No se han encontrado archivos - %s\n"
     STRING_REPLACE_ERROR7 "Error extendido 32\n"
     STRING_CMD_INFOLINE "  Consola de comandos de ReactOS                Escribe HELP para ver la ayuda  "
+    STRING_CMD_COPYRIGHT "(C) Copyright 1996-%s ReactOS Team.\n"
     STRING_REACTOS_VERSION "ReactOS [Versión %s %s]\n"
     STRING_CMD_SHELLINFO "\nIntérprete de comandos de ReactOS\nVersion %s %s"
     STRING_VERSION_RUNNING_ON "Funcionando en: "
diff --git a/base/shell/cmd/lang/fr-FR.rc b/base/shell/cmd/lang/fr-FR.rc
index 7968f9ba700..85d4ad62c12 100644
--- a/base/shell/cmd/lang/fr-FR.rc
+++ b/base/shell/cmd/lang/fr-FR.rc
@@ -543,6 +543,7 @@ titre         titre de la fenêtre"
     STRING_REPLACE_ERROR6 "Aucun fichier trouvé - %s\n"
     STRING_REPLACE_ERROR7 "Erreur étendue 32\n"
     STRING_CMD_INFOLINE "  ReactOS Command Prompt                                      Type HELP = Help  "
+    STRING_CMD_COPYRIGHT "(C) Copyright 1996-%s ReactOS Team.\n"
     STRING_REACTOS_VERSION "ReactOS [Version %s %s]\n"
     STRING_CMD_SHELLINFO "\nInterpréteur de ligne de commandes ReactOS\nVersion %s %s"
     STRING_VERSION_RUNNING_ON "Fonctionnant sous: "
diff --git a/base/shell/cmd/lang/hu-HU.rc b/base/shell/cmd/lang/hu-HU.rc
index 2994170e092..c4242536933 100644
--- a/base/shell/cmd/lang/hu-HU.rc
+++ b/base/shell/cmd/lang/hu-HU.rc
@@ -519,6 +519,7 @@ title         új cím\n"
     STRING_REPLACE_ERROR6 "Nem találhatóak fájlok - %s\n"
     STRING_REPLACE_ERROR7 "Kiterjesztett hiba 32\n"
     STRING_CMD_INFOLINE "  ReactOS Parancssor                                       HELP parancs = Súgó  "
+    STRING_CMD_COPYRIGHT "(C) Copyright 1996-%s ReactOS Team.\n"
     STRING_REACTOS_VERSION "ReactOS [Version %s %s]\n"
     STRING_CMD_SHELLINFO "\nReactOS Parancssor értelmező\nVersion %s %s"
     STRING_VERSION_RUNNING_ON "Ezen fut: "
diff --git a/base/shell/cmd/lang/id-ID.rc b/base/shell/cmd/lang/id-ID.rc
index 6f40cb787ab..8280f036a63 100644
--- a/base/shell/cmd/lang/id-ID.rc
+++ b/base/shell/cmd/lang/id-ID.rc
@@ -526,6 +526,7 @@ title         judul baru\n"
     STRING_REPLACE_ERROR6 "No files found - %s\n"
     STRING_REPLACE_ERROR7 "Extended Error 32\n"
     STRING_CMD_INFOLINE "  ReactOS Command Prompt                                      Type HELP = Help  "
+    STRING_CMD_COPYRIGHT "(C) Copyright 1996-%s ReactOS Team.\n"
     STRING_REACTOS_VERSION "ReactOS [Versi %s %s]\n"
     STRING_CMD_SHELLINFO "\nInterpreter Baris Perintah ReactOS\nVersi %s %s"
     STRING_VERSION_RUNNING_ON "Berjalan pada: "
diff --git a/base/shell/cmd/lang/it-IT.rc b/base/shell/cmd/lang/it-IT.rc
index a87f920652f..dc9ad0da8c0 100644
--- a/base/shell/cmd/lang/it-IT.rc
+++ b/base/shell/cmd/lang/it-IT.rc
@@ -536,6 +536,7 @@ titolo        il nuovo titolo\n"
     STRING_REPLACE_ERROR6 "Nessun file trovato - %s\n"
     STRING_REPLACE_ERROR7 "Errore esteso 32\n"
     STRING_CMD_INFOLINE "  ReactOS Command Prompt                                      Type HELP = Help  "
+    STRING_CMD_COPYRIGHT "(C) Copyright 1996-%s ReactOS Team.\n"
     STRING_REACTOS_VERSION "ReactOS [Version %s %s]\n"
     STRING_CMD_SHELLINFO "\nInterprete di linea di comando di ReactOS\nVersion %s %s"
     STRING_VERSION_RUNNING_ON "In esecuzione su: "
diff --git a/base/shell/cmd/lang/ja-JP.rc b/base/shell/cmd/lang/ja-JP.rc
index e6fc6fa6fe0..f34323c714e 100644
--- a/base/shell/cmd/lang/ja-JP.rc
+++ b/base/shell/cmd/lang/ja-JP.rc
@@ -534,6 +534,7 @@ RESTORE       ウィンドウを元のサイズに戻します。\n\
     STRING_REPLACE_ERROR6 "No files found - %s\n"
     STRING_REPLACE_ERROR7 "Extended Error 32\n"
     STRING_CMD_INFOLINE "  ReactOS Command Prompt                                      Type HELP = Help  "
+    STRING_CMD_COPYRIGHT "(C) Copyright 1996-%s ReactOS Team.\n"
     STRING_REACTOS_VERSION "ReactOS [Version %s %s]\n"
     STRING_CMD_SHELLINFO "\nReactOS Command Line Interpreter\nVersion %s %s"
     STRING_VERSION_RUNNING_ON "Running on: "
diff --git a/base/shell/cmd/lang/no-NO.rc b/base/shell/cmd/lang/no-NO.rc
index 43513601503..d25eedaf667 100644
--- a/base/shell/cmd/lang/no-NO.rc
+++ b/base/shell/cmd/lang/no-NO.rc
@@ -525,6 +525,7 @@ tittel        ny tittel\n"
     STRING_REPLACE_ERROR6 "Ingen filer ble funnet - %s\n"
     STRING_REPLACE_ERROR7 "Extended Error 32\n"
     STRING_CMD_INFOLINE "  ReactOS Command Prompt                                      Type HELP = Help  "
+    STRING_CMD_COPYRIGHT "(C) Copyright 1996-%s ReactOS Team.\n"
     STRING_REACTOS_VERSION "ReactOS [Versjon %s %s]\n"
     STRING_CMD_SHELLINFO "\nReactOS Kommandotolk\nVersjon %s %s"
     STRING_VERSION_RUNNING_ON "Kjører på: "
diff --git a/base/shell/cmd/lang/pl-PL.rc b/base/shell/cmd/lang/pl-PL.rc
index 24ee8ecacf2..6831307ea39 100644
--- a/base/shell/cmd/lang/pl-PL.rc
+++ b/base/shell/cmd/lang/pl-PL.rc
@@ -532,6 +532,7 @@ title         nowy tytuł okna\n"
     STRING_REPLACE_ERROR6 "Nie znaleziono plików - %s\n"
     STRING_REPLACE_ERROR7 "Extended Error 32 -  Błąd współdzielenia\n"
     STRING_CMD_INFOLINE "  Wiersz polecenia ReactOS                                    Type HELP = Help  "
+    STRING_CMD_COPYRIGHT "(C) Copyright 1996-%s ReactOS Team.\n"
     STRING_REACTOS_VERSION "ReactOS [Wersja %s %s]\n"
     STRING_CMD_SHELLINFO "\nInterpreter linii poleceń ReactOS\nWersja %s %s"
     STRING_VERSION_RUNNING_ON "Działający na: "
diff --git a/base/shell/cmd/lang/pt-BR.rc b/base/shell/cmd/lang/pt-BR.rc
index cf2373aad90..8c9c493fe8b 100644
--- a/base/shell/cmd/lang/pt-BR.rc
+++ b/base/shell/cmd/lang/pt-BR.rc
@@ -555,6 +555,7 @@ título      Novo título\n"
     STRING_REPLACE_ERROR6 "Nenhum arquivo encontrado - %s\n"
     STRING_REPLACE_ERROR7 "Erro estendido 32\n"
     STRING_CMD_INFOLINE "Prompt de comandos do ReactOS \tHELP = Ajuda"
+    STRING_CMD_COPYRIGHT "(C) Copyright 1996-%s ReactOS Team.\n"
     STRING_REACTOS_VERSION "ReactOS [Versão %s %s]\n"
     STRING_CMD_SHELLINFO "\nReactOS Interpretador de linha de comando\nVersão %s %s"
     STRING_VERSION_RUNNING_ON "Em execução em:"
diff --git a/base/shell/cmd/lang/pt-PT.rc b/base/shell/cmd/lang/pt-PT.rc
index f67a8febcb6..7f31964dd13 100644
--- a/base/shell/cmd/lang/pt-PT.rc
+++ b/base/shell/cmd/lang/pt-PT.rc
@@ -548,6 +548,7 @@ título      Novo título\n"
     STRING_REPLACE_ERROR6 "Nenhum ficheiro encontrado - %s\n"
     STRING_REPLACE_ERROR7 "Erro estendido 32\n"
     STRING_CMD_INFOLINE "Tipo de prompt de comando do ReactOS HELP = Ajuda"
+    STRING_CMD_COPYRIGHT "(C) Copyright 1996-%s ReactOS Team.\n"
     STRING_REACTOS_VERSION "ReactOS [Versão %s %s]\n"
     STRING_CMD_SHELLINFO "\nReactOS Intérprete de linha de comando\nVersão %s %s"
     STRING_VERSION_RUNNING_ON "Em execução em:"
diff --git a/base/shell/cmd/lang/ro-RO.rc b/base/shell/cmd/lang/ro-RO.rc
index be9d8953e8d..393deff645a 100644
--- a/base/shell/cmd/lang/ro-RO.rc
+++ b/base/shell/cmd/lang/ro-RO.rc
@@ -566,6 +566,7 @@ titlu         Noul titlu.\n"
     STRING_REPLACE_ERROR6 "Fișierele nu au fost găsite - %s\n"
     STRING_REPLACE_ERROR7 "Eroare extinsă 32\n"
     STRING_CMD_INFOLINE "  Interpretorul de comenzi ReactOS                       Tastați HELP = Ajutor  "
+    STRING_CMD_COPYRIGHT "(C) Copyright 1996-%s ReactOS Team.\n"
     STRING_REACTOS_VERSION "ReactOS [Versiunea %s %s]\n"
     STRING_CMD_SHELLINFO "\nInterpretorul de comenzi ReactOS\nVersiunea %s %s"
     STRING_VERSION_RUNNING_ON "Operând pe: "
diff --git a/base/shell/cmd/lang/ru-RU.rc b/base/shell/cmd/lang/ru-RU.rc
index 0cea72229f8..56b2606c3e2 100644
--- a/base/shell/cmd/lang/ru-RU.rc
+++ b/base/shell/cmd/lang/ru-RU.rc
@@ -544,6 +544,7 @@ RESTORE       восстанавливает окно\n\
     STRING_REPLACE_ERROR6 "Не найдено файлов - %s\n"
     STRING_REPLACE_ERROR7 "Расширенная ошибка 32\n"
     STRING_CMD_INFOLINE "  ReactOS Командная строка                            Введите HELP для Справки  "
+    STRING_CMD_COPYRIGHT "(C) Copyright 1996-%s ReactOS Team.\n"
     STRING_REACTOS_VERSION "ReactOS [Версия %s %s]\n"
     STRING_CMD_SHELLINFO "\nИнтерпретатор командной строки ReactOS\nВерсия %s %s"
     STRING_VERSION_RUNNING_ON "Запущен на: "
diff --git a/base/shell/cmd/lang/sk-SK.rc b/base/shell/cmd/lang/sk-SK.rc
index 12a60f88e71..7e4d11e3bec 100644
--- a/base/shell/cmd/lang/sk-SK.rc
+++ b/base/shell/cmd/lang/sk-SK.rc
@@ -533,6 +533,7 @@ title         new title\n"
     STRING_REPLACE_ERROR6 "Žiadne súbory sa nenašli - %s\n"
     STRING_REPLACE_ERROR7 "Extended Error 32\n"
     STRING_CMD_INFOLINE "  ReactOS Command Prompt                                      Type HELP = Help  "
+    STRING_CMD_COPYRIGHT "(C) Copyright 1996-%s ReactOS Team.\n"
     STRING_REACTOS_VERSION "ReactOS [Verzia %s %s]\n"
     STRING_CMD_SHELLINFO "\nInterpréter príkazového riadku systému ReactOS\nVerzia %s %s"
     STRING_VERSION_RUNNING_ON "Running on: "
diff --git a/base/shell/cmd/lang/sq-AL.rc b/base/shell/cmd/lang/sq-AL.rc
index 25b9fcef88e..5624200c555 100644
--- a/base/shell/cmd/lang/sq-AL.rc
+++ b/base/shell/cmd/lang/sq-AL.rc
@@ -531,6 +531,7 @@ title         titull i ri\n"
     STRING_REPLACE_ERROR6 "Nuk u gjet dokumenti - %s\n"
     STRING_REPLACE_ERROR7 "Error i zgjatur 32\n"
     STRING_CMD_INFOLINE "  ReactOS Command Prompt                                      Type HELP = Help  "
+    STRING_CMD_COPYRIGHT "(C) Copyright 1996-%s ReactOS Team.\n"
     STRING_REACTOS_VERSION "ReactOS [Versioni %s %s]\n"
     STRING_CMD_SHELLINFO "\nReactOS Interpretuesi i komandave\nVersioni %s %s"
     STRING_VERSION_RUNNING_ON "Funksionon në: "
diff --git a/base/shell/cmd/lang/sv-SE.rc b/base/shell/cmd/lang/sv-SE.rc
index 6a64655894f..21928bc8626 100644
--- a/base/shell/cmd/lang/sv-SE.rc
+++ b/base/shell/cmd/lang/sv-SE.rc
@@ -525,6 +525,7 @@ tittel        ny tittel\n"
     STRING_REPLACE_ERROR6 "Ingna filer hittades - %s\n"
     STRING_REPLACE_ERROR7 "Extended Error 32\n"
     STRING_CMD_INFOLINE "  ReactOS Command Prompt                                      Type HELP = Help  "
+    STRING_CMD_COPYRIGHT "(C) Copyright 1996-%s ReactOS Team.\n"
     STRING_REACTOS_VERSION "ReactOS [Version %s %s]\n"
     STRING_CMD_SHELLINFO "\nReactOS Kommandotolk\nVersion %s %s"
     STRING_VERSION_RUNNING_ON "Körs på: "
diff --git a/base/shell/cmd/lang/tr-TR.rc b/base/shell/cmd/lang/tr-TR.rc
index 77e9663e2d3..f759b1433f6 100644
--- a/base/shell/cmd/lang/tr-TR.rc
+++ b/base/shell/cmd/lang/tr-TR.rc
@@ -520,6 +520,7 @@ başlık        pencere için yeni başlık\n"
     STRING_REPLACE_ERROR6 "Hiçbir dosya bulunamadı - %s\n"
     STRING_REPLACE_ERROR7 "Genişletilmiş Hata 32\n"
     STRING_CMD_INFOLINE "  ReactOS Komut Satırı                                 Yardım için, HELP yazın"
+    STRING_CMD_COPYRIGHT "(C) Copyright 1996-%s ReactOS Team.\n"
     STRING_REACTOS_VERSION "ReactOS [Sürüm %s %s]\n"
     STRING_CMD_SHELLINFO "\nReactOS Komut Satırı Yorumlayıcısı\nSürüm %s %s"
     STRING_VERSION_RUNNING_ON "Üzerinde Çalışıyor: "
diff --git a/base/shell/cmd/lang/uk-UA.rc b/base/shell/cmd/lang/uk-UA.rc
index c903a9615df..05b24cf3cd4 100644
--- a/base/shell/cmd/lang/uk-UA.rc
+++ b/base/shell/cmd/lang/uk-UA.rc
@@ -537,6 +537,7 @@ title         новий заголовок\n"
     STRING_REPLACE_ERROR6 "Файли не знайдено - %s\n"
     STRING_REPLACE_ERROR7 "Розширена помилка 32\n"
     STRING_CMD_INFOLINE "  Командний рядок ReactOS                              Введіть HELP = Допомога  "
+    STRING_CMD_COPYRIGHT "(C) Copyright 1996-%s ReactOS Team.\n"
     STRING_REACTOS_VERSION "ReactOS [Версiя %s %s]\n"
     STRING_CMD_SHELLINFO "\nIнтерпретатор командного рядка ReactOS\nVersion %s %s"
     STRING_VERSION_RUNNING_ON "Запущений на: "
diff --git a/base/shell/cmd/lang/zh-CN.rc b/base/shell/cmd/lang/zh-CN.rc
index c3a6572b9f8..22fbddbe273 100644
--- a/base/shell/cmd/lang/zh-CN.rc
+++ b/base/shell/cmd/lang/zh-CN.rc
@@ -500,6 +500,7 @@ RESTORE       恢复窗口\n\
     STRING_REPLACE_ERROR6 "没有文件被发现 - %s\n"
     STRING_REPLACE_ERROR7 "扩展错误 32\n"
     STRING_CMD_INFOLINE "  ReactOS 命令行解释器                                       输入 HELP = 帮助  "
+    STRING_CMD_COPYRIGHT "(C) Copyright 1996-%s ReactOS Team.\n"
     STRING_REACTOS_VERSION "ReactOS [版本 %s %s]\n"
     STRING_CMD_SHELLINFO "\nReactOS 命令行解释器\n版本 %s %s"
     STRING_VERSION_RUNNING_ON "在 上运行"
diff --git a/base/shell/cmd/lang/zh-TW.rc b/base/shell/cmd/lang/zh-TW.rc
index 913295e16c8..dff7783f806 100644
--- a/base/shell/cmd/lang/zh-TW.rc
+++ b/base/shell/cmd/lang/zh-TW.rc
@@ -504,6 +504,7 @@ RESTORE       恢復視窗\n\
     STRING_REPLACE_ERROR6 "找不到檔案 - %s\n"
     STRING_REPLACE_ERROR7 "擴展錯誤 32\n"
     STRING_CMD_INFOLINE "  ReactOS 命令列直譯器                                       輸入 HELP = 說明  "
+    STRING_CMD_COPYRIGHT "(C) Copyright 1996-%s ReactOS Team.\n"
     STRING_REACTOS_VERSION "ReactOS [版本 %s %s]\n"
     STRING_CMD_SHELLINFO "\nReactOS 命令列直譯器\n版本 %s %s"
     STRING_VERSION_RUNNING_ON "在 上運行"
diff --git a/base/shell/cmd/prompt.c b/base/shell/cmd/prompt.c
index d835ea5f1e3..9c7abb678ac 100644
--- a/base/shell/cmd/prompt.c
+++ b/base/shell/cmd/prompt.c
@@ -66,6 +66,31 @@ VOID InitPrompt(VOID)
         SetEnvironmentVariable(_T("PROMPT"), DefaultPrompt);
 }
 
+/*
+ * Checks if information line should be displayed.
+ */
+BOOL HasInfoLine(VOID)
+{
+    LPTSTR pr;
+    TCHAR szPrompt[256];
+
+    if (GetEnvironmentVariable(_T("PROMPT"), szPrompt, _countof(szPrompt)))
+    {
+        pr = szPrompt;
+        while (*pr)
+        {
+            if (*pr++ != _T('$'))
+                continue;
+            if (!*pr || _totupper(*pr++) != _T('I'))
+                continue;
+
+            return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
 /*
  * Print an information line on top of the screen.
  */
@@ -121,17 +146,8 @@ VOID PrintPrompt(VOID)
      * Special pre-handling for $I: If the information line is displayed
      * on top of the screen, ensure that the prompt won't be hidden below it.
      */
-    for (pr = Prompt; *pr;)
-    {
-        if (*pr++ != _T('$'))
-            continue;
-        if (!*pr || _totupper(*pr++) != _T('I'))
-            continue;
-
-        if (GetCursorY() == 0)
-            ConOutChar(_T('\n'));
-        break;
-    }
+    if (HasInfoLine() && GetCursorY() == 0)
+        ConOutChar(_T('\n'));
 
     /* Parse the prompt string */
     for (pr = Prompt; *pr; ++pr)
diff --git a/base/shell/cmd/resource.h b/base/shell/cmd/resource.h
index 8024eeb2ad1..88a5780ec3f 100644
--- a/base/shell/cmd/resource.h
+++ b/base/shell/cmd/resource.h
@@ -86,6 +86,7 @@
 #define STRING_CTTY_HELP   618
 
 #define STRING_CMD_INFOLINE     620
+#define STRING_CMD_COPYRIGHT    621
 #define STRING_REACTOS_VERSION  623
 #define STRING_CMD_SHELLINFO    624
 
diff --git a/base/shell/cmd/ver.c b/base/shell/cmd/ver.c
index 7d4e497688d..0c4461c0258 100644
--- a/base/shell/cmd/ver.c
+++ b/base/shell/cmd/ver.c
@@ -145,7 +145,7 @@ INT cmd_ver (LPTSTR param)
     {
         ConOutPuts(_T("\n\n"));
         ConOutPuts(_T("Copyright (C) 1994-1998 Tim Norman and others.\n"));
-        ConOutPuts(_T("Copyright (C) 1998-") _T(COPYRIGHT_YEAR) _T(" ReactOS Team\n"));
+        ConOutResPrintf(STRING_CMD_COPYRIGHT, _T(COPYRIGHT_YEAR));
 
         for (i = 0; param[i]; i++)
         {
diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf
index eb22a18637b..319b74f288d 100644
--- a/boot/bootdata/hivesys.inf
+++ b/boot/bootdata/hivesys.inf
@@ -1521,7 +1521,6 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PRN",0x0000
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x00020002,"%SystemRoot%\system32\cmd.exe"
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020002,"%SystemRoot%\bin;%SystemRoot%\System32;%SystemRoot%;%SystemRoot%\System32\Wbem"
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","PATHEXT",0x00000002,".COM;.EXE;.BAT;.CMD"
-HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","PROMPT",0x00000002,"$P$G$I"
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020002,"%SystemRoot%\TEMP"
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020002,"%SystemRoot%\TEMP"
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020002,"%SystemRoot%"