diff --git a/CHANGES b/CHANGES
index 8150881fe..bfab61b7d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,7 @@ Bugs fixed
 * #2900: Fix epub content.opf: add auto generated orphan files to spine.
 * #2899: Fix ``hasdoc()`` function in Jinja2 template. It can detect ``genindex``, ``search`` collectly.
 * #2901: Fix epub result: skip creating links from image tags to original image files.
+* #2917: inline code is hyphenated on HTML
 
 Release 1.4.6 (released Aug 20, 2016)
 =====================================
diff --git a/sphinx/themes/basic/static/basic.css_t b/sphinx/themes/basic/static/basic.css_t
index cdc703b09..54f5e5199 100644
--- a/sphinx/themes/basic/static/basic.css_t
+++ b/sphinx/themes/basic/static/basic.css_t
@@ -494,6 +494,13 @@ pre {
     overflow-y: hidden;  /* fixes display issues on Chrome browsers */
 }
 
+span.pre {
+    -moz-hyphens: none;
+    -ms-hyphens: none;
+    -webkit-hyphens: none;
+    hyphens: none;
+}
+
 td.linenos pre {
     padding: 5px 0px;
     border: 0;