diff --git a/web/react/components/about_build_modal.jsx b/web/react/components/about_build_modal.jsx
new file mode 100644
index 0000000000..87a58ba970
--- /dev/null
+++ b/web/react/components/about_build_modal.jsx
@@ -0,0 +1,60 @@
+// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+export default class AboutBuildModal extends React.Component {
+    render() {
+        const config = global.window.config;
+
+        return (
+            <div
+                className='modal fade'
+                ref='modal'
+                id='about_build'
+                tabIndex='-1'
+                role='dialog'
+                aria-hidden='true'
+            >
+               <div className='modal-dialog'>
+                  <div className='modal-content'>
+                    <div className='modal-header'>
+                      <button
+                          type='button'
+                          className='close'
+                          data-dismiss='modal'
+                          aria-label='Close'
+                      >
+                        <span aria-hidden='true'>&times;</span>
+                      </button>
+                      <h4
+                          className='modal-title'
+                      >
+                        <span className='name'>{`Mattermost ${config.Version}`}</span>
+                      </h4>
+                    </div>
+                    <div className='modal-body'>
+                      <div className='row form-group'>
+                        <div className='col-sm-3 info__label'>{'Build Number:'}</div>
+                        <div className='col-sm-9'>{config.BuildNumber}</div>
+                      </div>
+                      <div className='row form-group'>
+                        <div className='col-sm-3 info__label'>{'Build Date:'}</div>
+                        <div className='col-sm-9'>{config.BuildDate}</div>
+                      </div>
+                      <div className='row'>
+                        <div className='col-sm-3 info__label'>{'Build Hash:'}</div>
+                        <div className='col-sm-9'>{config.BuildHash}</div>
+                      </div>
+                    </div>
+                    <div className='modal-footer'>
+                      <button
+                          type='button'
+                          className='btn btn-default'
+                          data-dismiss='modal'
+                      >{'Close'}</button>
+                    </div>
+                  </div>
+               </div>
+            </div>
+        );
+    }
+}
diff --git a/web/react/components/navbar_dropdown.jsx b/web/react/components/navbar_dropdown.jsx
index 78057d10bc..1adb0d8c67 100644
--- a/web/react/components/navbar_dropdown.jsx
+++ b/web/react/components/navbar_dropdown.jsx
@@ -223,6 +223,15 @@ export default class NavbarDropdown extends React.Component {
                                 {'Report a Problem'}
                             </a>
                         </li>
+                        <li>
+                            <a
+                                href='#'
+                                data-toggle='modal'
+                                data-target='#about_build'
+                            >
+                                {'About Mattermost'}
+                            </a>
+                        </li>
                     </ul>
                 </li>
             </ul>
diff --git a/web/react/components/user_settings/user_settings_security.jsx b/web/react/components/user_settings/user_settings_security.jsx
index b59c08af0b..4ff4775a7a 100644
--- a/web/react/components/user_settings/user_settings_security.jsx
+++ b/web/react/components/user_settings/user_settings_security.jsx
@@ -251,17 +251,6 @@ export default class SecurityTab extends React.Component {
                     <div className='divider-dark first'/>
                     {passwordSection}
                     <div className='divider-dark'/>
-                    <ul
-                        className='section-min'
-                    >
-                        <li className='col-sm-10 section-title'>{'Version ' + global.window.config.Version}</li>
-                        <li className='col-sm-7 section-describe'>
-                            <div className='text-nowrap'>{'Build Number: ' + global.window.config.BuildNumber}</div>
-                            <div className='text-nowrap'>{'Build Date: ' + global.window.config.BuildDate}</div>
-                            <div className='text-nowrap'>{'Build Hash: ' + global.window.config.BuildHash}</div>
-                        </li>
-                    </ul>
-                    <div className='divider-dark'/>
                     <br></br>
                     <a
                         data-toggle='modal'
diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx
index c333fd57dc..3eed913663 100644
--- a/web/react/pages/channel.jsx
+++ b/web/react/pages/channel.jsx
@@ -30,6 +30,7 @@ var ErrorStore = require('../stores/error_store.jsx');
 var ChannelLoader = require('../components/channel_loader.jsx');
 var MentionList = require('../components/mention_list.jsx');
 var ChannelInfoModal = require('../components/channel_info_modal.jsx');
+var AboutBuildModal = require('../components/about_build_modal.jsx');
 var AccessHistoryModal = require('../components/access_history_modal.jsx');
 var ActivityLogModal = require('../components/activity_log_modal.jsx');
 var RemovedFromChannelModal = require('../components/removed_from_channel_modal.jsx');
@@ -150,6 +151,11 @@ function setupChannelPage(props) {
         document.getElementById('channel_info_modal')
     );
 
+    React.render(
+        <AboutBuildModal />,
+        document.getElementById('about_build_modal')
+    );
+
     React.render(
         <MoreChannelsModal />,
         document.getElementById('more_channels_modal')
diff --git a/web/templates/channel.html b/web/templates/channel.html
index 2af94e415f..787a1e6a68 100644
--- a/web/templates/channel.html
+++ b/web/templates/channel.html
@@ -47,6 +47,7 @@
   <div id="team_members_modal"></div>
   <div id="direct_channel_modal"></div>
   <div id="channel_info_modal"></div>
+  <div id="about_build_modal"></div>
   <div id="access_history_modal"></div>
   <div id="activity_log_modal"></div>
   <div id="removed_from_channel_modal"></div>