diff --git a/AUTHORS b/AUTHORS
index be716abe43..8ed9286a77 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -63,11 +63,13 @@ answer newbie questions, and generally made Django that much better:
     James Bennett
     Julian Bez
     Arvis Bickovskis <viestards.lists@gmail.com>
+    Natalia Bidart
     Paul Bissex <http://e-scribe.com/>
     Simon Blanchard
     David Blewett <david@dawninglight.net>
     Matt Boersma <matt@sprout.org>
     boobsd@gmail.com
+    Matías Bordese
     Andrew Brehaut <http://brehaut.net/blog>
     brut.alll@gmail.com
     btoll@bestweb.net
diff --git a/django/template/__init__.py b/django/template/__init__.py
index 503cfb77bf..95aa36af21 100644
--- a/django/template/__init__.py
+++ b/django/template/__init__.py
@@ -480,8 +480,7 @@ filter_raw_string = r"""
     'arg_sep': re.escape(FILTER_ARGUMENT_SEPARATOR),
   }
 
-filter_raw_string = filter_raw_string.replace("\n", "").replace(" ", "")
-filter_re = re.compile(filter_raw_string, re.UNICODE)
+filter_re = re.compile(filter_raw_string, re.UNICODE|re.VERBOSE)
 
 class FilterExpression(object):
     r"""
diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py
index a9e7f40fad..835b1a9df3 100644
--- a/django/template/defaulttags.py
+++ b/django/template/defaulttags.py
@@ -1100,7 +1100,7 @@ def url(parser, token):
 
     The URL will look like ``/clients/client/123/``.
     """
-    bits = token.contents.split(' ')
+    bits = token.split_contents()
     if len(bits) < 2:
         raise TemplateSyntaxError("'%s' takes at least one argument"
                                   " (path to a view)" % bits[0])
diff --git a/django/utils/text.py b/django/utils/text.py
index 8bc256e804..fe46e26b52 100644
--- a/django/utils/text.py
+++ b/django/utils/text.py
@@ -197,7 +197,13 @@ def javascript_quote(s, quote_double_quotes=False):
     return str(ustring_re.sub(fix, s))
 javascript_quote = allow_lazy(javascript_quote, unicode)
 
-smart_split_re = re.compile('("(?:[^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'(?:[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'|[^\\s]+)')
+# Expression to match some_token and some_token="with spaces" (and similarly
+# for single-quoted strings).
+smart_split_re = re.compile(r"""
+    ([^\s"]*"(?:[^"\\]*(?:\\.[^"\\]*)*)"\S*|
+     [^\s']*'(?:[^'\\]*(?:\\.[^'\\]*)*)'\S*|
+     \S+)""", re.VERBOSE)
+
 def smart_split(text):
     r"""
     Generator that splits a string by spaces, leaving quoted phrases together.
diff --git a/tests/regressiontests/templates/tests.py b/tests/regressiontests/templates/tests.py
index 91c6d22b33..5176b116e9 100644
--- a/tests/regressiontests/templates/tests.py
+++ b/tests/regressiontests/templates/tests.py
@@ -974,6 +974,7 @@ class Templates(unittest.TestCase):
             'url07': (u'{% url regressiontests.templates.views.client2 tag=v %}', {'v': u'Ω'}, '/url_tag/%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4/%CE%A9/'),
             'url08': (u'{% url метка_оператора v %}', {'v': 'Ω'}, '/url_tag/%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4/%CE%A9/'),
             'url09': (u'{% url метка_оператора_2 tag=v %}', {'v': 'Ω'}, '/url_tag/%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4/%CE%A9/'),
+            'url10': ('{% url regressiontests.templates.views.client_action id=client.id,action="two words" %}', {'client': {'id': 1}}, '/url_tag/client/1/two%20words/'),
 
             # Failures
             'url-fail01': ('{% url %}', {}, template.TemplateSyntaxError),
diff --git a/tests/regressiontests/text/tests.py b/tests/regressiontests/text/tests.py
index 75c360f344..09b8c30398 100644
--- a/tests/regressiontests/text/tests.py
+++ b/tests/regressiontests/text/tests.py
@@ -15,6 +15,18 @@ r"""
 [u'"a', u"'one"]
 >>> print list(smart_split(r'''all friends' tests'''))[1]
 friends'
+>>> list(smart_split(u'url search_page words="something else"'))
+[u'url', u'search_page', u'words="something else"']
+>>> list(smart_split(u"url search_page words='something else'"))
+[u'url', u'search_page', u"words='something else'"]
+>>> list(smart_split(u'url search_page words "something else"'))
+[u'url', u'search_page', u'words', u'"something else"']
+>>> list(smart_split(u'url search_page words-"something else"'))
+[u'url', u'search_page', u'words-"something else"']
+>>> list(smart_split(u'url search_page words=hello'))
+[u'url', u'search_page', u'words=hello']
+>>> list(smart_split(u'url search_page words="something else'))
+[u'url', u'search_page', u'words="something', u'else']
 
 ### urlquote #############################################################
 >>> from django.utils.http import urlquote, urlquote_plus