diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py
index c7031992e8..586966d94f 100644
--- a/src/calibre/gui2/widgets.py
+++ b/src/calibre/gui2/widgets.py
@@ -551,7 +551,8 @@ class LineEditECM(object):
         self.setText(unicode(self.text()).swapcase())
 
     def title_case(self):
-        self.setText(unicode(self.text()).title())
+        from calibre.utils.titlecase import titlecase
+        self.setText(titlecase(unicode(self.text())))
 
 
 class EnLineEdit(LineEditECM, QLineEdit):
diff --git a/src/calibre/utils/titlecase.py b/src/calibre/utils/titlecase.py
new file mode 100755
index 0000000000..3ead4848fd
--- /dev/null
+++ b/src/calibre/utils/titlecase.py
@@ -0,0 +1,94 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+Original Perl version by: John Gruber http://daringfireball.net/ 10 May 2008
+Python version by Stuart Colville http://muffinresearch.co.uk
+License: http://www.opensource.org/licenses/mit-license.php
+"""
+
+import re
+
+__all__ = ['titlecase']
+__version__ = '0.5'
+
+SMALL = 'a|an|and|as|at|but|by|en|for|if|in|of|on|or|the|to|v\.?|via|vs\.?'
+PUNCT = r"""!"#$%&'‘()*+,\-./:;?@[\\\]_`{|}~"""
+
+SMALL_WORDS = re.compile(r'^(%s)$' % SMALL, re.I)
+INLINE_PERIOD = re.compile(r'[a-z][.][a-z]', re.I)
+UC_ELSEWHERE = re.compile(r'[%s]*?[a-zA-Z]+[A-Z]+?' % PUNCT)
+CAPFIRST = re.compile(r"^[%s]*?([A-Za-z])" % PUNCT)
+SMALL_FIRST = re.compile(r'^([%s]*)(%s)\b' % (PUNCT, SMALL), re.I)
+SMALL_LAST = re.compile(r'\b(%s)[%s]?$' % (SMALL, PUNCT), re.I)
+SUBPHRASE = re.compile(r'([:.;?!][ ])(%s)' % SMALL)
+APOS_SECOND = re.compile(r"^[dol]{1}['‘]{1}[a-z]+$", re.I)
+ALL_CAPS = re.compile(r'^[A-Z\s%s]+$' % PUNCT)
+UC_INITIALS = re.compile(r"^(?:[A-Z]{1}\.{1}|[A-Z]{1}\.{1}[A-Z]{1})+$")
+MAC_MC = re.compile(r"^([Mm]a?c)(\w+)")
+
+def titlecase(text):
+
+    """
+    Titlecases input text
+
+    This filter changes all words to Title Caps, and attempts to be clever
+    about *un*capitalizing SMALL words like a/an/the in the input.
+
+    The list of "SMALL words" which are not capped comes from
+    the New York Times Manual of Style, plus 'vs' and 'v'.
+
+    """
+
+    all_caps = ALL_CAPS.match(text)
+
+    words = re.split('\s', text)
+    line = []
+    for word in words:
+        if all_caps:
+            if UC_INITIALS.match(word):
+                line.append(word)
+                continue
+            else:
+                word = word.lower()
+
+        if APOS_SECOND.match(word):
+            word = word.replace(word[0], word[0].upper())
+            word = word.replace(word[2], word[2].upper())
+            line.append(word)
+            continue
+        if INLINE_PERIOD.search(word) or UC_ELSEWHERE.match(word):
+            line.append(word)
+            continue
+        if SMALL_WORDS.match(word):
+            line.append(word.lower())
+            continue
+
+        match = MAC_MC.match(word)
+        if match:
+            line.append("%s%s" % (match.group(1).capitalize(),
+                                  match.group(2).capitalize()))
+            continue
+
+        hyphenated = []
+        for item in word.split('-'):
+            hyphenated.append(CAPFIRST.sub(lambda m: m.group(0).upper(), item))
+        line.append("-".join(hyphenated))
+
+
+    result = " ".join(line)
+
+    result = SMALL_FIRST.sub(lambda m: '%s%s' % (
+        m.group(1),
+        m.group(2).capitalize()
+    ), result)
+
+    result = SMALL_LAST.sub(lambda m: m.group(0).capitalize(), result)
+
+    result = SUBPHRASE.sub(lambda m: '%s%s' % (
+        m.group(1),
+        m.group(2).capitalize()
+    ), result)
+
+    return result
+