diff --git a/components/manager/scripts/create.py b/components/manager/scripts/create.py
index c9e1d16dd..f617679b5 100644
--- a/components/manager/scripts/create.py
+++ b/components/manager/scripts/create.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 import os
+from datetime import datetime
 from os.path import join, dirname
 
 from cloudify import ctx
@@ -147,5 +148,15 @@ def restore_agent_resources(agents_dir):
             )
 
 
+def store_manager_version():
+    version = os.environ.get('MANAGER_VERSION', '')
+    build_date = datetime.now().strftime('%Y-%m-%d %H:%M')
+    motd = ' '.join(['Cloudify Manager', version,
+                     '(bootstrap {0})'.format(build_date)])
+    # easiest way to sudo-append to file without changing its chmod...
+    utils.sudo(['bash', '-c', "echo '{0}' >> /etc/motd".format(motd)])
+
+
 execute_before_bootstrap()
 deploy_manager_sources()
+store_manager_version()
diff --git a/inputs/manager-inputs.yaml b/inputs/manager-inputs.yaml
index 83f24aad1..dc8bd418e 100644
--- a/inputs/manager-inputs.yaml
+++ b/inputs/manager-inputs.yaml
@@ -1,4 +1,9 @@
 inputs:
+  #############################
+  # Version Label
+  #############################
+  manager_version:
+    default: 4.2.0-.dev1
 
   #############################
   # Security Settings
diff --git a/types/manager-types.yaml b/types/manager-types.yaml
index 6045dc42a..a39ce19e5 100644
--- a/types/manager-types.yaml
+++ b/types/manager-types.yaml
@@ -47,6 +47,8 @@ node_types:
               default: components/manager/scripts/create.py
             hide_output: *hide_output
             fabric_env: *simple_fabric_env
+            MANAGER_VERSION:
+              default: { get_attribute: [manager_configuration, manager_version] }
         delete:
           implementation: fabric.fabric_plugin.tasks.run_script
           inputs:
@@ -71,7 +73,7 @@ node_types:
       public_ip:
         default: ''
       manager_version:
-        default: 4.0.0
+        default: { get_input: manager_version }
       cloudify:
         description: >
           Configuration for Cloudify Manager