diff --git a/autoload/phpcomplete.vim b/autoload/phpcomplete.vim
index d4c8b4c3..459356b4 100644
--- a/autoload/phpcomplete.vim
+++ b/autoload/phpcomplete.vim
@@ -887,7 +887,7 @@ function! phpcomplete#CompleteClassName(base, kinds, current_namespace, imports)
 		let c_name = matchstr(line, '\c\(class\|interface\)\s*\zs[a-zA-Z_\x7f-\xff][a-zA-Z_0-9\x7f-\xff]*')
 		let kind = (line =~? '^\s*class' ? 'c' : 'i')
 		if c_name != '' && c_name =~? '^'.base
-			call add(res, {'word': c_name, 'kind': kind})
+			call add(res, {'word': c_name, 'kind': kind, 'file': expand('%')})
 		endif
 	endfor
 
@@ -916,11 +916,11 @@ function! phpcomplete#CompleteClassName(base, kinds, current_namespace, imports)
 			let relative_name = namespace_part.tag.name
 			" match base without the namespace part for namespaced base but not namespaced tags, for tagfiles with old ctags
 			if !has_key(tag, 'namespace') && index(kinds, tag.kind) != -1 && stridx(tolower(tag.name), tolower(base[len(namespace_part):])) == 0
-				call add(no_namespace_matches, {'word': leading_slash.relative_name, 'kind': tag.kind, 'menu': tag.filename, 'info': tag.filename })
+				call add(no_namespace_matches, {'word': leading_slash.relative_name, 'kind': tag.kind, 'menu': tag.filename, 'info': tag.filename, 'file': tag.filename })
 			endif
 			if has_key(tag, 'namespace') && index(kinds, tag.kind) != -1 && tag.namespace ==? namespace_for_class
 				let full_name = tag.namespace.'\'.tag.name " absolute namespaced name (without leading '\')
-				call add(namespaced_matches, {'word': leading_slash == '\' ? leading_slash.full_name : relative_name, 'kind': tag.kind, 'menu': tag.filename, 'info': tag.filename })
+				call add(namespaced_matches, {'word': leading_slash == '\' ? leading_slash.full_name : relative_name, 'kind': tag.kind, 'menu': tag.filename, 'info': tag.filename, 'file': tag.filename })
 			endif
 		endfor
 		" if there was a tag with namespace field, assume tag files with namespace support, so the matches
@@ -943,14 +943,14 @@ function! phpcomplete#CompleteClassName(base, kinds, current_namespace, imports)
 				if has_key(g:php_builtin_classes[tolower(classname)].methods, '__construct')
 					let menu = g:php_builtin_classes[tolower(classname)]['methods']['__construct']['signature']
 				endif
-				call add(res, {'word': leading_slash.g:php_builtin_classes[tolower(classname)].name, 'kind': 'c', 'menu': menu})
+				call add(res, {'word': leading_slash.g:php_builtin_classes[tolower(classname)].name, 'kind': 'c', 'menu': menu, 'file': ''})
 			endfor
 		endif
 
 		if index(kinds, 'i') != -1
 			let builtin_interfaces = filter(keys(copy(g:php_builtin_interfaces)), 'v:val =~? "^'.substitute(a:base, '\\', '', 'g').'"')
 			for interfacename in builtin_interfaces
-				call add(res, {'word': leading_slash.g:php_builtin_interfaces[interfacename]['name'], 'kind': 'i', 'menu': ''})
+				call add(res, {'word': leading_slash.g:php_builtin_interfaces[interfacename]['name'], 'kind': 'i', 'menu': '', 'file': ''})
 			endfor
 		endif
 	endif
@@ -963,6 +963,20 @@ function! phpcomplete#CompleteClassName(base, kinds, current_namespace, imports)
 		endif
 	endfor
 
+	if g:phpcomplete_parse_docblock_comments
+		for item in res
+			if get(item, 'file') != '' && get(item, 'kind') == 'c'
+				let name_parts = split(item.word, '\')
+				let name = name_parts[len(name_parts) - 1]
+				let class_contents = split(phpcomplete#GetClassContents(item.file, name), "\\(\r\n\\\n\r|\\|\n\\)")
+				let docblock = phpcomplete#GetDocBlock(class_contents, '__construct')
+				if docblock != ''
+					let item.info = phpcomplete#FormatDocBlock(phpcomplete#ParseDocBlock(docblock))
+				endif
+			endif
+		endfor
+	endif
+
 	let res = sort(res, 'phpcomplete#CompareCompletionRow')
 	return res
 endfunction
diff --git a/tests/CompleteClassName_test.vim b/tests/CompleteClassName_test.vim
index b5aea879..c238be06 100644
--- a/tests/CompleteClassName_test.vim
+++ b/tests/CompleteClassName_test.vim
@@ -19,9 +19,9 @@ fun! TestCase_complete_classes_from_current_file()
 
     let res = phpcomplete#CompleteClassName('', ['c', 'i'], '\', {})
     call VUAssertEquals([
-                \ {'word': 'BarClass', 'kind': 'c'},
-                \ {'word': 'BarInterface', 'kind': 'i'},
-                \ {'word': 'FooClass', 'kind': 'c'}],
+                \ {'word': 'BarClass', 'file': path, 'kind': 'c'},
+                \ {'word': 'BarInterface', 'file': path, 'kind': 'i'},
+                \ {'word': 'FooClass', 'file': path, 'kind': 'c'}],
                 \ res)
     silent! bw! %
 endf
@@ -41,37 +41,37 @@ fun! TestCase_complete_classes_from_tags()
 
     let res = phpcomplete#CompleteClassName('LowerCase', ['c', 'i'], '\', {})
     call VUAssertEquals([
-                \ {'word': 'lowercasetagclass', 'menu': 'fixtures/CompleteClassName/tagclass.php', 'info': 'fixtures/CompleteClassName/tagclass.php', 'kind': 'c'}],
+                \ {'word': 'lowercasetagclass', 'menu': 'fixtures/CompleteClassName/tagclass.php', 'file': 'fixtures/CompleteClassName/tagclass.php', 'info': 'fixtures/CompleteClassName/tagclass.php', 'kind': 'c'}],
                 \ res, "should match tag classes case insensitive")
 
     let res = phpcomplete#CompleteClassName('T', ['c', 'i'], '\', {})
     call VUAssertEquals([
-                \ {'word': 'TagClass', 'menu': 'fixtures/CompleteClassName/tagclass.php', 'info': 'fixtures/CompleteClassName/tagclass.php', 'kind': 'c'}],
+                \ {'word': 'TagClass', 'menu': 'fixtures/CompleteClassName/tagclass.php', 'file': 'fixtures/CompleteClassName/tagclass.php', 'info': 'fixtures/CompleteClassName/tagclass.php', 'kind': 'c'}],
                 \ res)
     let res = phpcomplete#CompleteClassName('B', ['i'], '\', {})
     call VUAssertEquals([
-                \ {'word': 'BarInterface', 'menu': 'fixtures/CompleteClassName/foo.class.php', 'info': 'fixtures/CompleteClassName/foo.class.php', 'kind': 'i'}],
+                \ {'word': 'BarInterface', 'menu': 'fixtures/CompleteClassName/foo.class.php', 'file': 'fixtures/CompleteClassName/foo.class.php', 'info': 'fixtures/CompleteClassName/foo.class.php', 'kind': 'i'}],
                 \ res, "should find only interfaces")
     let res = phpcomplete#CompleteClassName('B', ['c', 'i'], '\', {})
     call VUAssertEquals([
-                \ {'word': 'BarClass', 'menu': 'fixtures/CompleteClassName/foo.class.php', 'info': 'fixtures/CompleteClassName/foo.class.php', 'kind': 'c'},
-                \ {'word': 'BarInterface', 'menu': 'fixtures/CompleteClassName/foo.class.php', 'info': 'fixtures/CompleteClassName/foo.class.php', 'kind': 'i'}],
+                \ {'word': 'BarClass', 'menu': 'fixtures/CompleteClassName/foo.class.php', 'file': 'fixtures/CompleteClassName/foo.class.php', 'info': 'fixtures/CompleteClassName/foo.class.php', 'kind': 'c'},
+                \ {'word': 'BarInterface', 'menu': 'fixtures/CompleteClassName/foo.class.php', 'file': 'fixtures/CompleteClassName/foo.class.php', 'info': 'fixtures/CompleteClassName/foo.class.php', 'kind': 'i'}],
                 \ res, "should find both classes and interfaces in tags")
 
     " should work just the same with old ctags generated tag files
     exe ':set tags='.old_style_tags_path
     let res = phpcomplete#CompleteClassName('T', ['c', 'i'], '\', {})
     call VUAssertEquals([
-                \ {'word': 'TagClass', 'menu': 'fixtures/CompleteClassName/tagclass.php', 'info': 'fixtures/CompleteClassName/tagclass.php', 'kind': 'c'}],
+                \ {'word': 'TagClass', 'menu': 'fixtures/CompleteClassName/tagclass.php', 'file': 'fixtures/CompleteClassName/tagclass.php', 'info': 'fixtures/CompleteClassName/tagclass.php', 'kind': 'c'}],
                 \ res)
     let res = phpcomplete#CompleteClassName('B', ['i'], '\', {})
     call VUAssertEquals([
-                \ {'word': 'BarInterface', 'menu': 'fixtures/CompleteClassName/foo.class.php', 'info': 'fixtures/CompleteClassName/foo.class.php', 'kind': 'i'}],
+                \ {'word': 'BarInterface', 'menu': 'fixtures/CompleteClassName/foo.class.php', 'file': 'fixtures/CompleteClassName/foo.class.php', 'info': 'fixtures/CompleteClassName/foo.class.php', 'kind': 'i'}],
                 \ res, "should find only interfaces")
     let res = phpcomplete#CompleteClassName('B', ['c', 'i'], '\', {})
     call VUAssertEquals([
-                \ {'word': 'BarClass', 'menu': 'fixtures/CompleteClassName/foo.class.php', 'info': 'fixtures/CompleteClassName/foo.class.php', 'kind': 'c'},
-                \ {'word': 'BarInterface', 'menu': 'fixtures/CompleteClassName/foo.class.php', 'info': 'fixtures/CompleteClassName/foo.class.php', 'kind': 'i'}],
+                \ {'word': 'BarClass', 'menu': 'fixtures/CompleteClassName/foo.class.php', 'file': 'fixtures/CompleteClassName/foo.class.php', 'info': 'fixtures/CompleteClassName/foo.class.php', 'kind': 'c'},
+                \ {'word': 'BarInterface', 'menu': 'fixtures/CompleteClassName/foo.class.php', 'file': 'fixtures/CompleteClassName/foo.class.php', 'info': 'fixtures/CompleteClassName/foo.class.php', 'kind': 'i'}],
                 \ res, "should find both classes and interfaces in tags")
 
     silent! bw! %
@@ -97,13 +97,13 @@ fun! TestCase_complete_classes_from_built_in_classes()
 
     let res = phpcomplete#CompleteClassName('', ['c'], '\', {})
     call VUAssertEquals([
-                \ {'word': 'DateTime', 'menu': '', 'kind': 'c'}],
+                \ {'word': 'DateTime', 'menu': '', 'file': '', 'kind': 'c'}],
                 \ res)
 
     " user typed \ and hits <c-x><c-o> in a file starting with "namespace NS1;"
     let res = phpcomplete#CompleteClassName('\', ['c'], 'NS1', {})
     call VUAssertEquals([
-                \ {'word': '\DateTime', 'menu': '', 'kind': 'c'}],
+                \ {'word': '\DateTime', 'menu': '', 'file': '', 'kind': 'c'}],
                 \ res)
 
 
@@ -116,13 +116,13 @@ fun! TestCase_complete_classes_from_built_in_classes()
 
     let res = phpcomplete#CompleteClassName('T', ['i'], '\', {})
     call VUAssertEquals([
-                \ {'word': 'Traversable', 'menu': '', 'kind': 'i'}],
+                \ {'word': 'Traversable', 'menu': '', 'file': '', 'kind': 'i'}],
                 \ res)
 
     " user typed \T and hits <c-x><c-o> in a file starting with "namespace NS1;"
     let res = phpcomplete#CompleteClassName('\T', ['i'], 'NS1', {})
     call VUAssertEquals([
-                \ {'word': '\Traversable', 'menu': '', 'kind': 'i'}],
+                \ {'word': '\Traversable', 'menu': '', 'file': '', 'kind': 'i'}],
                 \ res)
 
     let g:php_builtin_interfaces = {
@@ -134,7 +134,7 @@ fun! TestCase_complete_classes_from_built_in_classes()
     " of the outer dictionary keys
     let res = phpcomplete#CompleteClassName('tra', ['i'], '\', {})
     call VUAssertEquals([
-                \ {'word': 'FindMeFoo', 'menu': '', 'kind': 'i'}],
+                \ {'word': 'FindMeFoo', 'menu': '', 'file': '', 'kind': 'i'}],
                 \ res)
 
     silent! bw! %
@@ -161,7 +161,7 @@ fun! TestCase_adds_arguments_of_constructors_for_built_in_classes()
 
     let res = phpcomplete#CompleteClassName('', ['c'], '\', {})
     call VUAssertEquals([
-                \ {'word': 'DateTime', 'menu': '[ string $time = "now" [, DateTimeZone $timezone = NULL]]', 'kind': 'c'}],
+                \ {'word': 'DateTime', 'menu': '[ string $time = "now" [, DateTimeZone $timezone = NULL]]', 'file': '', 'kind': 'c'}],
                 \ res)
     silent! bw! %
 endf
@@ -176,12 +176,12 @@ fun! TestCase_filters_class_names_with_the_namespaces_typed_in_base()
 
     let res = phpcomplete#CompleteClassName('NS1\N', ['c'], '\', {})
     call VUAssertEquals([
-                \ {'word': 'NS1\NameSpacedFoo', 'menu': 'fixtures/CompleteClassName/namespaced.foo.php', 'info': 'fixtures/CompleteClassName/namespaced.foo.php', 'kind': 'c'}],
+                \ {'word': 'NS1\NameSpacedFoo', 'menu': 'fixtures/CompleteClassName/namespaced.foo.php', 'file': 'fixtures/CompleteClassName/namespaced.foo.php', 'info': 'fixtures/CompleteClassName/namespaced.foo.php', 'kind': 'c'}],
                 \ res)
 
     let res = phpcomplete#CompleteClassName('NS1\N', ['i'], '\', {})
     call VUAssertEquals([
-                \ {'word': 'NS1\NameSpacedFooInterface', 'menu': 'fixtures/CompleteClassName/namespaced.foo.php', 'info': 'fixtures/CompleteClassName/namespaced.foo.php', 'kind': 'i'}],
+                \ {'word': 'NS1\NameSpacedFooInterface', 'menu': 'fixtures/CompleteClassName/namespaced.foo.php', 'file': 'fixtures/CompleteClassName/namespaced.foo.php', 'info': 'fixtures/CompleteClassName/namespaced.foo.php', 'kind': 'i'}],
                 \ res)
 
     " with old style ctags, just complete every classame that matches the
@@ -190,11 +190,11 @@ fun! TestCase_filters_class_names_with_the_namespaces_typed_in_base()
 
     let res = phpcomplete#CompleteClassName('NS1\N', ['c'], '\', {})
     call VUAssertEquals([
-                \ {'word': 'NS1\NameSpacedFoo', 'menu': 'fixtures/CompleteClassName/namespaced.foo.php', 'info': 'fixtures/CompleteClassName/namespaced.foo.php', 'kind': 'c'}],
+                \ {'word': 'NS1\NameSpacedFoo', 'menu': 'fixtures/CompleteClassName/namespaced.foo.php', 'file': 'fixtures/CompleteClassName/namespaced.foo.php', 'info': 'fixtures/CompleteClassName/namespaced.foo.php', 'kind': 'c'}],
                 \ res)
     let res = phpcomplete#CompleteClassName('NS1\N', ['i'], '\', {})
     call VUAssertEquals([
-                \ {'word': 'NS1\NameSpacedFooInterface', 'menu': 'fixtures/CompleteClassName/namespaced.foo.php', 'info': 'fixtures/CompleteClassName/namespaced.foo.php', 'kind': 'i'}],
+                \ {'word': 'NS1\NameSpacedFooInterface', 'menu': 'fixtures/CompleteClassName/namespaced.foo.php', 'file': 'fixtures/CompleteClassName/namespaced.foo.php', 'info': 'fixtures/CompleteClassName/namespaced.foo.php', 'kind': 'i'}],
                 \ res)
 
     " test for when there are namespaces in the matched tags the non-namespaced
@@ -202,7 +202,7 @@ fun! TestCase_filters_class_names_with_the_namespaces_typed_in_base()
     exe ':set tags='.old_style_tags_path.','.tags_path
     let res = phpcomplete#CompleteClassName('NS1\NameSpacedF', ['c'], '\', {})
     call VUAssertEquals([
-                \ {'word': 'NS1\NameSpacedFoo', 'menu': 'fixtures/CompleteClassName/namespaced.foo.php', 'info': 'fixtures/CompleteClassName/namespaced.foo.php', 'kind': 'c'}],
+                \ {'word': 'NS1\NameSpacedFoo', 'menu': 'fixtures/CompleteClassName/namespaced.foo.php', 'file': 'fixtures/CompleteClassName/namespaced.foo.php', 'info': 'fixtures/CompleteClassName/namespaced.foo.php', 'kind': 'c'}],
                 \ res)
 endf
 
@@ -216,12 +216,12 @@ fun! TestCase_filters_class_names_with_the_current_namespace_but_doesnt_add_the_
 
     let res = phpcomplete#CompleteClassName('N', ['c'], 'NS1', {})
     call VUAssertEquals([
-                \ {'word': 'NameSpacedFoo', 'menu': 'fixtures/CompleteClassName/namespaced.foo.php', 'info': 'fixtures/CompleteClassName/namespaced.foo.php', 'kind': 'c'}],
+                \ {'word': 'NameSpacedFoo', 'menu': 'fixtures/CompleteClassName/namespaced.foo.php', 'file': 'fixtures/CompleteClassName/namespaced.foo.php', 'info': 'fixtures/CompleteClassName/namespaced.foo.php', 'kind': 'c'}],
                 \ res)
 
     let res = phpcomplete#CompleteClassName('N', ['i'], 'NS1', {})
     call VUAssertEquals([
-                \ {'word': 'NameSpacedFooInterface', 'menu': 'fixtures/CompleteClassName/namespaced.foo.php', 'info': 'fixtures/CompleteClassName/namespaced.foo.php', 'kind': 'i'}],
+                \ {'word': 'NameSpacedFooInterface', 'menu': 'fixtures/CompleteClassName/namespaced.foo.php', 'file': 'fixtures/CompleteClassName/namespaced.foo.php', 'info': 'fixtures/CompleteClassName/namespaced.foo.php', 'kind': 'i'}],
                 \ res)
 
     " old style tags
@@ -229,12 +229,12 @@ fun! TestCase_filters_class_names_with_the_current_namespace_but_doesnt_add_the_
 
     let res = phpcomplete#CompleteClassName('N', ['c'], 'NS1', {})
     call VUAssertEquals([
-                \ {'word': 'NameSpacedFoo', 'menu': 'fixtures/CompleteClassName/namespaced.foo.php', 'info': 'fixtures/CompleteClassName/namespaced.foo.php', 'kind': 'c'}],
+                \ {'word': 'NameSpacedFoo', 'menu': 'fixtures/CompleteClassName/namespaced.foo.php', 'file': 'fixtures/CompleteClassName/namespaced.foo.php', 'info': 'fixtures/CompleteClassName/namespaced.foo.php', 'kind': 'c'}],
                 \ res)
 
     let res = phpcomplete#CompleteClassName('N', ['i'], 'NS1', {})
     call VUAssertEquals([
-                \ {'word': 'NameSpacedFooInterface', 'menu': 'fixtures/CompleteClassName/namespaced.foo.php', 'info': 'fixtures/CompleteClassName/namespaced.foo.php', 'kind': 'i'}],
+                \ {'word': 'NameSpacedFooInterface', 'menu': 'fixtures/CompleteClassName/namespaced.foo.php', 'file': 'fixtures/CompleteClassName/namespaced.foo.php', 'info': 'fixtures/CompleteClassName/namespaced.foo.php', 'kind': 'i'}],
                 \ res)
 endf
 
@@ -264,19 +264,19 @@ fun! TestCase_completes_class_names_from_imported_namespaces_via_tags()
     " comlete classes from imported namespace
     let res = phpcomplete#CompleteClassName('SUBNS\F', ['c'], '\', {'SUBNS': {'name': 'NS1\SUBNS', 'kind': 'n', 'builtin': 0,}})
     call VUAssertEquals([
-                \ {'word': 'SUBNS\FooSub', 'menu': 'fixtures/common/namespaced_foo.php', 'info': 'fixtures/common/namespaced_foo.php', 'kind': 'c'}],
+                \ {'word': 'SUBNS\FooSub', 'menu': 'fixtures/common/namespaced_foo.php', 'file': 'fixtures/common/namespaced_foo.php', 'info': 'fixtures/common/namespaced_foo.php', 'kind': 'c'}],
                 \ res)
 
     " comlete classes from imported and renamed namespace, leaving typed in part as-is
     let res = phpcomplete#CompleteClassName('SUB\Fo', ['c'], '\', {'SUB': {'name': 'NS1\SUBNS', 'kind': 'n', 'builtin': 0,}})
     call VUAssertEquals([
-                \ {'word': 'SUB\FooSub', 'menu': 'fixtures/common/namespaced_foo.php', 'info': 'fixtures/common/namespaced_foo.php', 'kind': 'c'}],
+                \ {'word': 'SUB\FooSub', 'menu': 'fixtures/common/namespaced_foo.php', 'file': 'fixtures/common/namespaced_foo.php', 'info': 'fixtures/common/namespaced_foo.php', 'kind': 'c'}],
                 \ res)
 
     " comlete classes from absolute namespace prefixes
     let res = phpcomplete#CompleteClassName('\NS1\SUBNS\Fo', ['c'], 'NS1', {})
     call VUAssertEquals([
-                \ {'word': '\NS1\SUBNS\FooSub', 'menu': 'fixtures/common/namespaced_foo.php', 'info': 'fixtures/common/namespaced_foo.php', 'kind': 'c'}],
+                \ {'word': '\NS1\SUBNS\FooSub', 'menu': 'fixtures/common/namespaced_foo.php', 'file': 'fixtures/common/namespaced_foo.php', 'info': 'fixtures/common/namespaced_foo.php', 'kind': 'c'}],
                 \ res)
 
     " set old tags to a fixture
@@ -286,10 +286,28 @@ fun! TestCase_completes_class_names_from_imported_namespaces_via_tags()
     " last \ will be returned
     let res = phpcomplete#CompleteClassName('SUBNS\F', ['c'], '\', {'SUBNS': {'name': 'NS1\SUBNS', 'kind': 'n', 'builtin': 0,}})
     call VUAssertEquals([
-                \ {'word': 'SUBNS\Foo', 'menu': 'fixtures/common/fixtures/common/namespaced_foo.php', 'info': 'fixtures/common/fixtures/common/namespaced_foo.php', 'kind': 'c'},
-                \ {'word': 'SUBNS\FooSub', 'menu': 'fixtures/common/fixtures/common/namespaced_foo.php', 'info': 'fixtures/common/fixtures/common/namespaced_foo.php', 'kind': 'c'},
-                \ {'word': 'SUBNS\FooSubSub', 'menu': 'fixtures/common/fixtures/common/namespaced_foo.php', 'info': 'fixtures/common/fixtures/common/namespaced_foo.php', 'kind': 'c'}],
+                \ {'word': 'SUBNS\Foo', 'menu': 'fixtures/common/fixtures/common/namespaced_foo.php', 'file': 'fixtures/common/fixtures/common/namespaced_foo.php', 'info': 'fixtures/common/fixtures/common/namespaced_foo.php', 'kind': 'c'},
+                \ {'word': 'SUBNS\FooSub', 'menu': 'fixtures/common/fixtures/common/namespaced_foo.php', 'file': 'fixtures/common/fixtures/common/namespaced_foo.php', 'info': 'fixtures/common/fixtures/common/namespaced_foo.php', 'kind': 'c'},
+                \ {'word': 'SUBNS\FooSubSub', 'menu': 'fixtures/common/fixtures/common/namespaced_foo.php', 'file': 'fixtures/common/fixtures/common/namespaced_foo.php', 'info': 'fixtures/common/fixtures/common/namespaced_foo.php', 'kind': 'c'}],
                 \ res)
 endf
 
+fun! TestCase_completes_class_names_from_imported_namespaces_via_tags()
+    call SetUp()
+    let g:phpcomplete_parse_docblock_comments = 1
+
+    let path =  expand('%:p:h')."/".'fixtures/CompleteClassName/constructor_docblock.php'
+    below 1new
+    exe ":silent! edit ".path
+
+    exe ':29'
+    let res = phpcomplete#CompleteClassName('Foobar', ['c'], '\', {})
+    call VUAssertEquals([
+                \ {'word': 'Foobar', 'file': '/home/dudu/.vim/bundle/phpcomplete.vim/tests/fixtures/CompleteClassName/constructor_docblock.php', 'info': "Description:\n\tConstructor\n\t\n\tSome docs\n", 'kind': 'c'},
+                \ {'word': 'Foobar2', 'file': '/home/dudu/.vim/bundle/phpcomplete.vim/tests/fixtures/CompleteClassName/constructor_docblock.php', 'info': "Description:\n\tConstructor\n\t\n\tSome docs2\n", 'kind': 'c'}],
+                \ res)
+
+    silent! bw! %
+endf
+
 " vim: foldmethod=marker:expandtab:ts=4:sts=4
diff --git a/tests/fixtures/CompleteClassName/constructor_docblock.php b/tests/fixtures/CompleteClassName/constructor_docblock.php
new file mode 100644
index 00000000..b0d38089
--- /dev/null
+++ b/tests/fixtures/CompleteClassName/constructor_docblock.php
@@ -0,0 +1,28 @@
+<?php
+
+class Foobar2 {
+
+	/**
+	 * Constructor
+	 *
+	 * Some docs2
+	 */
+	public function __construct() {
+	}
+}
+
+class Foobar {
+
+	/**
+	 * Constructor
+	 *
+	 * Some docs
+	 */
+	public function __construct($foo = 'bar') {
+		$this->foo = $foo;
+	}
+}
+
+
+$f = new Foobar
+;