diff --git a/guacamole/src/main/webapp/app/manage/templates/manageConnection.html b/guacamole/src/main/webapp/app/manage/templates/manageConnection.html
index 85e4f917e..737ace3d2 100644
--- a/guacamole/src/main/webapp/app/manage/templates/manageConnection.html
+++ b/guacamole/src/main/webapp/app/manage/templates/manageConnection.html
@@ -72,6 +72,7 @@
                     <th>{{'MANAGE_CONNECTION.TABLE_HEADER_HISTORY_USERNAME' | translate}}</th>
                     <th>{{'MANAGE_CONNECTION.TABLE_HEADER_HISTORY_START' | translate}}</th>
                     <th>{{'MANAGE_CONNECTION.TABLE_HEADER_HISTORY_DURATION' | translate}}</th>
+                    <th>{{'MANAGE_CONNECTION.TABLE_HEADER_HISTORY_REMOTEHOST' | translate}}</th>
                 </tr>
             </thead>
             <tbody>
@@ -81,6 +82,7 @@
                     <td class="duration"
                         translate="{{wrapper.durationText}}"
                         translate-values="{VALUE: wrapper.duration.value, UNIT: wrapper.duration.unit}"></td>
+                    <td class="remoteHost">{{wrapper.entry.remoteHost}}</td>
                 </tr>
             </tbody>
         </table>
diff --git a/guacamole/src/main/webapp/app/rest/types/ConnectionHistoryEntry.js b/guacamole/src/main/webapp/app/rest/types/ConnectionHistoryEntry.js
index e4dfb143a..bfa9f6989 100644
--- a/guacamole/src/main/webapp/app/rest/types/ConnectionHistoryEntry.js
+++ b/guacamole/src/main/webapp/app/rest/types/ConnectionHistoryEntry.js
@@ -52,6 +52,13 @@ angular.module('rest').factory('ConnectionHistoryEntry', [function defineConnect
          */
         this.connectionName = template.connectionName;
 
+        /**
+         * The remote host associated with this history entry.
+         *
+         * @type String
+         */
+        this.remoteHost = template.remoteHost;
+
         /**
          * The time that usage began, in seconds since 1970-01-01 00:00:00 UTC.
          *
@@ -186,4 +193,4 @@ angular.module('rest').factory('ConnectionHistoryEntry', [function defineConnect
 
     return ConnectionHistoryEntry;
 
-}]);
\ No newline at end of file
+}]);
diff --git a/guacamole/src/main/webapp/app/settings/directives/guacSettingsConnectionHistory.js b/guacamole/src/main/webapp/app/settings/directives/guacSettingsConnectionHistory.js
index 216641d78..09ce84185 100644
--- a/guacamole/src/main/webapp/app/settings/directives/guacSettingsConnectionHistory.js
+++ b/guacamole/src/main/webapp/app/settings/directives/guacSettingsConnectionHistory.js
@@ -84,7 +84,8 @@ angular.module('settings').directive('guacSettingsConnectionHistory', [function
                 '-startDate',
                 '-duration',
                 'username',
-                'connectionName'
+                'connectionName',
+                'remoteHost'
             ]);
 
             // Get session date format
@@ -192,6 +193,7 @@ angular.module('settings').directive('guacSettingsConnectionHistory', [function
                     'SETTINGS_CONNECTION_HISTORY.TABLE_HEADER_SESSION_STARTDATE',
                     'SETTINGS_CONNECTION_HISTORY.TABLE_HEADER_SESSION_DURATION',
                     'SETTINGS_CONNECTION_HISTORY.TABLE_HEADER_SESSION_CONNECTION_NAME',
+                    'SETTINGS_CONNECTION_HISTORY.TABLE_HEADER_SESSION_REMOTEHOST',
                     'SETTINGS_CONNECTION_HISTORY.FILENAME_HISTORY_CSV'
                 ]).then(function headerTranslated(translations) {
 
@@ -200,7 +202,8 @@ angular.module('settings').directive('guacSettingsConnectionHistory', [function
                         translations['SETTINGS_CONNECTION_HISTORY.TABLE_HEADER_SESSION_USERNAME'],
                         translations['SETTINGS_CONNECTION_HISTORY.TABLE_HEADER_SESSION_STARTDATE'],
                         translations['SETTINGS_CONNECTION_HISTORY.TABLE_HEADER_SESSION_DURATION'],
-                        translations['SETTINGS_CONNECTION_HISTORY.TABLE_HEADER_SESSION_CONNECTION_NAME']
+                        translations['SETTINGS_CONNECTION_HISTORY.TABLE_HEADER_SESSION_CONNECTION_NAME'],
+                        translations['SETTINGS_CONNECTION_HISTORY.TABLE_HEADER_SESSION_REMOTEHOST']
                     ]];
 
                     // Add rows for all history entries, using the same sort
@@ -215,7 +218,8 @@ angular.module('settings').directive('guacSettingsConnectionHistory', [function
                                 historyEntryWrapper.username,
                                 $filter('date')(historyEntryWrapper.startDate, $scope.dateFormat),
                                 historyEntryWrapper.duration / 1000,
-                                historyEntryWrapper.connectionName
+                                historyEntryWrapper.connectionName,
+                                historyEntryWrapper.remoteHost
                             ]);
                         }
                     );
diff --git a/guacamole/src/main/webapp/app/settings/templates/settingsConnectionHistory.html b/guacamole/src/main/webapp/app/settings/templates/settingsConnectionHistory.html
index 2963ba138..67d62064f 100644
--- a/guacamole/src/main/webapp/app/settings/templates/settingsConnectionHistory.html
+++ b/guacamole/src/main/webapp/app/settings/templates/settingsConnectionHistory.html
@@ -29,6 +29,9 @@
                     <th guac-sort-order="order" guac-sort-property="'connectionName'">
                         {{'SETTINGS_CONNECTION_HISTORY.TABLE_HEADER_SESSION_CONNECTION_NAME' | translate}}
                     </th>
+                    <th guac-sort-order="order" guac-sort-property="'remoteHost'">
+                        {{'SETTINGS_CONNECTION_HISTORY.TABLE_HEADER_SESSION_REMOTEHOST' | translate}}
+                    </th>
                 </tr>
             </thead>
             <tbody ng-class="{loading: !isLoaded()}">
@@ -38,6 +41,7 @@
                     <td translate="{{historyEntryWrapper.readableDurationText}}"
                         translate-values="{VALUE: historyEntryWrapper.readableDuration.value, UNIT: historyEntryWrapper.readableDuration.unit}"></td>
                     <td>{{historyEntryWrapper.connectionName}}</td>
+                    <td>{{historyEntryWrapper.remoteHost}}</td>
                 </tr>
             </tbody>
         </table>
diff --git a/guacamole/src/main/webapp/app/settings/types/ConnectionHistoryEntryWrapper.js b/guacamole/src/main/webapp/app/settings/types/ConnectionHistoryEntryWrapper.js
index 9794f6aae..87d691757 100644
--- a/guacamole/src/main/webapp/app/settings/types/ConnectionHistoryEntryWrapper.js
+++ b/guacamole/src/main/webapp/app/settings/types/ConnectionHistoryEntryWrapper.js
@@ -50,6 +50,13 @@ angular.module('settings').factory('ConnectionHistoryEntryWrapper', ['$injector'
          */
         this.connectionName = historyEntry.connectionName;
 
+        /**
+         * The remote host associated with this history entry.
+         *
+         * @type String
+         */
+        this.remoteHost = historyEntry.remoteHost;
+
         /**
          * The username of the user associated with this particular usage of
          * the connection.
diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json
index 0fa792989..2b4fb5d32 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -220,9 +220,10 @@
         "SECTION_HEADER_HISTORY"         : "Usage History",
         "SECTION_HEADER_PARAMETERS"      : "Parameters",
 
-        "TABLE_HEADER_HISTORY_USERNAME" : "Username",
-        "TABLE_HEADER_HISTORY_START"    : "Start Time",
-        "TABLE_HEADER_HISTORY_DURATION" : "Duration",
+        "TABLE_HEADER_HISTORY_USERNAME"   : "Username",
+        "TABLE_HEADER_HISTORY_START"      : "Start Time",
+        "TABLE_HEADER_HISTORY_DURATION"   : "Duration",
+        "TABLE_HEADER_HISTORY_REMOTEHOST" : "Remote Host",
 
         "TEXT_CONFIRM_DELETE"   : "Connections cannot be restored after they have been deleted. Are you sure you want to delete this connection?",
         "TEXT_HISTORY_DURATION" : "@:APP.TEXT_HISTORY_DURATION"
@@ -598,6 +599,7 @@
 
         "TABLE_HEADER_SESSION_CONNECTION_NAME" : "Connection name",
         "TABLE_HEADER_SESSION_DURATION"        : "Duration",
+        "TABLE_HEADER_SESSION_REMOTEHOST"      : "Remote host",
         "TABLE_HEADER_SESSION_STARTDATE"       : "Start time",
         "TABLE_HEADER_SESSION_USERNAME"        : "Username",