diff --git a/guacamole/pom.xml b/guacamole/pom.xml
index 0573c4c19..ff662b155 100644
--- a/guacamole/pom.xml
+++ b/guacamole/pom.xml
@@ -386,6 +386,14 @@
             <scope>runtime</scope>
         </dependency>
 
+        <!-- Polyfill for <datalist> element support -->
+        <dependency>
+            <groupId>org.webjars.bowergithub.mfranzke</groupId>
+            <artifactId>datalist-polyfill</artifactId>
+            <version>1.14.0</version>
+            <scope>runtime</scope>
+        </dependency>
+
         <!-- Jetty 8 servlet API (websocket)  -->
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
diff --git a/guacamole/src/licenses/LICENSE b/guacamole/src/licenses/LICENSE
index c2e6bf5be..447470769 100644
--- a/guacamole/src/licenses/LICENSE
+++ b/guacamole/src/licenses/LICENSE
@@ -390,6 +390,15 @@ Carlito (http://code.google.com/p/chromium/issues/detail?id=280557)
         SIL Open Font (bundled/carlito/LICENSE)
 
 
+datalist-polyfill (https://github.com/mfranzke/datalist-polyfill)
+-----------------------------------------------------------------
+
+    Version: 1.14.0
+    From: 'Maximilian Franzke' (https://github.com/mfranzke)
+    License(s):
+        MIT (bundled/datalist-polyfill-1.14.0/LICENSE)
+
+
 FileSaver.js (https://github.com/eligrey/FileSaver.js)
 ------------------------------------------------------
 
diff --git a/guacamole/src/licenses/bundled/datalist-polyfill-1.14.0/LICENSE b/guacamole/src/licenses/bundled/datalist-polyfill-1.14.0/LICENSE
new file mode 100644
index 000000000..8864d4a39
--- /dev/null
+++ b/guacamole/src/licenses/bundled/datalist-polyfill-1.14.0/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/guacamole/src/main/webapp/index.html b/guacamole/src/main/webapp/index.html
index fd5dba44e..5a53d8a23 100644
--- a/guacamole/src/main/webapp/index.html
+++ b/guacamole/src/main/webapp/index.html
@@ -71,8 +71,9 @@
         <script type="text/javascript" src="webjars/angular-translate-interpolation-messageformat/2.16.0/angular-translate-interpolation-messageformat.min.js"></script>
         <script type="text/javascript" src="webjars/angular-translate-loader-static-files/2.16.0/angular-translate-loader-static-files.min.js"></script>
 
-        <!-- Polyfills for Blob and the FileSaver API -->
+        <!-- Polyfills for the "datalist" element, Blob and the FileSaver API -->
         <script type="text/javascript" src="webjars/blob-polyfill/1.0.20150320/Blob.js"></script>
+        <script type="text/javascript" src="webjars/datalist-polyfill/1.14.0/datalist-polyfill.min.js"></script>
         <script type="text/javascript" src="webjars/filesaver/1.3.3/FileSaver.min.js"></script>
 
         <!-- Allow arbitrary ordering of Angular module creation and retrieval -->