diff --git a/bashrc b/bashrc
index 84dbb130..91adc7a0 100644
--- a/bashrc
+++ b/bashrc
@@ -128,6 +128,9 @@ fi
 #Shopt settings.
 #shopt -s autocd
 
+# Show the hostname and uptime on shell start
+hostname && uptime
+
 #####   Environment                 7RS56S  #####
 # Environment should be placed to .environment or .bash_environment (or .bashenv).
 
diff --git a/zshrc b/zshrc
index ca79a1b5..72f57b4e 100644
--- a/zshrc
+++ b/zshrc
@@ -50,6 +50,9 @@ zstyle ':completion:*' verbose true
 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#)*=0=01;31'
 zstyle ':completion:*:kill:*' command 'ps -u $USER -o pid,%cpu,tty,cputime,cmd'
 
+# Show the hostname and uptime on shell start
+hostname && uptime
+
 #####   Environment                 7RS56S  #####
 # Environment should be placed to .environment or .zsh_environment (or .zshenv).