--- a/build/application.ini.in
+++ b/build/application.ini.in
@@ -18,16 +18,19 @@
 [App]
 Vendor=@MOZ_APP_VENDOR@
 Name=@MOZ_APP_BASENAME@
 RemotingName=@MOZ_APP_REMOTINGNAME@
 #ifdef MOZ_APP_DISPLAYNAME
 CodeName=@MOZ_APP_DISPLAYNAME@
 #endif
 Version=@MOZ_APP_VERSION@
+#ifdef MOZ_APP_DISPLAY_VERSION
+DisplayVersion=@MOZ_APP_DISPLAY_VERSION@
+#endif
 #ifdef MOZ_APP_PROFILE
 Profile=@MOZ_APP_PROFILE@
 #endif
 BuildID=@MOZ_BUILDID@
 #ifdef MOZ_SOURCE_REPO
 SourceRepository=@MOZ_SOURCE_REPO@
 #endif
 #ifdef MOZ_SOURCE_STAMP

--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -1300,16 +1300,17 @@ or run without that action (ie: --no-{ac
         python = self.query_exe('python2.7')
         base_cmd = [
             python, os.path.join(dirs['abs_src_dir'], 'mach'), 'python',
             print_conf_setting_path, dirs['abs_app_ini_path'], 'App'
         ]
         properties_needed = [
             {'ini_name': 'SourceStamp', 'prop_name': 'sourcestamp'},
             {'ini_name': 'Version', 'prop_name': 'appVersion'},
+            {'ini_name': 'DisplayVersion', 'prop_name': 'appFullVersion'},
             {'ini_name': 'Name', 'prop_name': 'appName'}
         ]
         env = self.query_build_env()
         # dirs['abs_obj_dir'] can be different from env['MOZ_OBJDIR'] on
         # mac, and that confuses mach.
         del env['MOZ_OBJDIR']
         for prop in properties_needed:
             prop_val = self.get_output_from_command_m(

--- a/testing/mozharness/mozharness/mozilla/updates/balrog.py
+++ b/testing/mozharness/mozharness/mozilla/updates/balrog.py
@@ -28,16 +28,19 @@ class BalrogMixin(object):
             buildbot_properties,
             self.buildbot_properties.items(),
         )))
         if self.config.get('balrog_platform'):
             balrog_props["properties"]["platform"] = self.config['balrog_platform']
         if "branch" not in balrog_props["properties"]:
             balrog_props["properties"]["branch"] = self.branch
 
+        # TODO Clean up. 
+        balrog_props['properties']['appVersion'] = balrog_props['properties']['appFullVersion']
+
         self.dump_config(props_path, balrog_props)
 
     def submit_balrog_updates(self, release_type="nightly", product=None):
         c = self.config
         dirs = self.query_abs_dirs()
 
         if self.buildbot_config and "properties" in self.buildbot_config:
             product = self.buildbot_config["properties"]["product"]