diff --git a/reactos/boot/bootdata/CMakeLists.txt b/reactos/boot/bootdata/CMakeLists.txt
index 2d71ccd2fbb..f5c2f0e2ffa 100644
--- a/reactos/boot/bootdata/CMakeLists.txt
+++ b/reactos/boot/bootdata/CMakeLists.txt
@@ -76,6 +76,7 @@ add_livecd_shortcut("Clipboard Viewer" clipbrd.exe "Profiles/All Users/Start Men
 add_livecd_shortcut("Keyboard Layout Switcher" kbswitch.exe "Profiles/All Users/Start Menu/Programs/System Tools")
 add_livecd_shortcut("ReactX Diagnostic" dxdiag.exe "Profiles/All Users/Start Menu/Programs/System Tools")
 add_livecd_shortcut("Regedit" regedit.exe "Profiles/All Users/Start Menu/Programs/System Tools")
+add_livecd_shortcut("Task Manager" taskmgr.exe "Profiles/All Users/Start Menu/Programs/System Tools")
 add_livecd_shortcut("ReactOS Explorer" explorer.exe "Profiles/All Users/Start Menu/Programs")
 
 add_custom_target(livecd_links DEPENDS ${LIVECD_SHORTCUTS})
diff --git a/reactos/media/inf/shortcuts.inf b/reactos/media/inf/shortcuts.inf
index 8d0eabf9225..7e9af99ad5d 100644
--- a/reactos/media/inf/shortcuts.inf
+++ b/reactos/media/inf/shortcuts.inf
@@ -44,6 +44,7 @@ GamesShortcuts=2, %GAMES%
 %SystemRoot%\system32\clipbrd.exe, %CLIPBRD_TITLE%, %CLIPBRD_DESC%, 0
 %SystemRoot%\system32\kbswitch.exe, %KBSWITCH_TITLE%, %KBSWITCH_DESC%, 0
 %SystemRoot%\regedit.exe, %REGEDIT_TITLE%, %REGEDIT_DESC%, 0
+%SystemRoot%\system32\taskmgr.exe, %TASKMGR_TITLE%, %TASKMGR_DESC%, 0
 %SystemRoot%\system32\dxdiag.exe, %DXDIAG_TITLE%, %DXDIAG_DESC%, 0
 
 [AccessibilityShortcuts]
@@ -109,6 +110,8 @@ KBSWITCH_TITLE=Keyboard Layout Switcher
 KBSWITCH_DESC=Keyboard Layout Switcher
 REGEDIT_TITLE=Registry Editor
 REGEDIT_DESC=Launch Registry Editor
+TASKMGR_TITLE=Task Manager
+TASKMGR_DESC=Launch the Task Manager
 DXDIAG_TITLE=ReactX Diagnostic
 DXDIAG_DESC=Launch ReactX-Diagnostic program
 MAGNIFY_TITLE=Magnify
@@ -559,6 +562,8 @@ KBSWITCH_TITLE=Sélecteur de configuration clavier
 KBSWITCH_DESC=Sélecteur de configuration clavier
 REGEDIT_TITLE=Éditeur de Registre
 REGEDIT_DESC=Lancer l'Éditeur de Registre
+TASKMGR_TITLE=Gestionnaire des tâches
+TASKMGR_DESC=Lancer le Gestionnaire des tâches
 DXDIAG_TITLE=Diagnostic ReactX
 DXDIAG_DESC=Lancer le prorgramme de diagnostic ReactX
 MAGNIFY_TITLE=Loupe