X-Git-Url: http://nitlanguage.org

diff --git a/src/modelbuilder.nit b/src/modelbuilder.nit
index dc48ee9..3dbd389 100644
--- a/src/modelbuilder.nit
+++ b/src/modelbuilder.nit
@@ -474,10 +474,12 @@ class ModelBuilder
 		var pn = rdp.basename(".nit")
 		var mp = dirpath.join_path(pn + ".nit").simplify_path
 
+		var dirpath2 = dirpath
 		if not mp.file_exists then
 			if pn == "src" then
 				# With a src directory, the group name is the name of the parent directory
-				pn = rdp.dirname.basename("")
+				dirpath2 = rdp.dirname
+				pn = dirpath2.basename("")
 			else
 				return null
 			end
@@ -498,6 +500,17 @@ class ModelBuilder
 			mgroup = new MGroup(pn, parent.mproject, parent)
 			toolcontext.info("found sub group `{mgroup.full_name}` at {dirpath}", 2)
 		end
+		var readme = dirpath2.join_path("README.md")
+		if not readme.file_exists then readme = dirpath2.join_path("README")
+		if readme.file_exists then
+			var mdoc = new MDoc
+			var s = new IFStream.open(readme)
+			while not s.eof do
+				mdoc.content.add(s.read_line)
+			end
+			mgroup.mdoc = mdoc
+			mdoc.original_mentity = mgroup
+		end
 		mgroup.filepath = dirpath
 		mgroups[rdp] = mgroup
 		return mgroup
@@ -616,7 +629,11 @@ class ModelBuilder
 
 		if decl != null then
 			var ndoc = decl.n_doc
-			if ndoc != null then mmodule.mdoc = ndoc.to_mdoc
+			if ndoc != null then
+				var mdoc = ndoc.to_mdoc
+				mmodule.mdoc = mdoc
+				mdoc.original_mentity = mmodule
+			end
 		end
 
 		return mmodule