diff --git a/AUTHORS.txt b/AUTHORS.txt
index 48cb385f..b5619dcb 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -42,6 +42,7 @@ Cristi Burcă (@scribu)
 bstaint (@bstaint)
 Mathias Rav (@Mortal) <rav@cs.au.dk>
 Daniel Fiterman (@dfit99) <fitermandaniel2@gmail.com>
+Simon Ruggier (@sruggier)
 
 
 Note: (@user) means a github user name.
diff --git a/jedi/evaluate/docstrings.py b/jedi/evaluate/docstrings.py
index 1b7db0da..788decb0 100644
--- a/jedi/evaluate/docstrings.py
+++ b/jedi/evaluate/docstrings.py
@@ -29,7 +29,7 @@ from jedi.evaluate.iterable import SequenceLiteralContext, FakeSequence
 
 DOCSTRING_PARAM_PATTERNS = [
     r'\s*:type\s+%s:\s*([^\n]+)',  # Sphinx
-    r'\s*:param\s+(\w+)\s+%s:[^\n]+',  # Sphinx param with type
+    r'\s*:param\s+(\w+)\s+%s:[^\n]*',  # Sphinx param with type
     r'\s*@type\s+%s:\s*([^\n]+)',  # Epydoc
 ]
 
diff --git a/test/completion/docstring.py b/test/completion/docstring.py
index 338080a4..88db52d1 100644
--- a/test/completion/docstring.py
+++ b/test/completion/docstring.py
@@ -49,6 +49,17 @@ def sphinxy2(a, b, x):
 #? 
 sphinxy2()
 
+
+def sphinxy_param_type_wrapped(a):
+    """
+    :param str a:
+        Some description wrapped onto the next line with no space after the
+        colon.
+    """
+    #? str()
+    a
+
+
 # local classes -> github #370
 class ProgramNode():
     pass