diff -u --recursive portage-2.1.9.42/man/make.conf.5 portage-2.1.9.42-sam/man/make.conf.5
--- portage-2.1.9.42/man/make.conf.5	2011-03-02 11:55:04.000000000 +0700
+++ portage-2.1.9.42-sam/man/make.conf.5	2011-04-13 01:54:40.000000000 +0700
@@ -328,6 +328,9 @@
 Fetch everything in \fBSRC_URI\fR regardless of \fBUSE\fR settings,
 except do not fetch anything when \fImirror\fR is in \fBRESTRICT\fR.
 .TP
+.B misspell-suggestions
+Suggests valids packages name when the given one doesn't exist.
+.TP
 .B multilib\-strict
 Many Makefiles assume that their libraries should go to /usr/lib, or
 $(prefix)/lib. This assumption can cause a serious mess if /usr/lib
diff -u --recursive portage-2.1.9.42/pym/_emerge/depgraph.py portage-2.1.9.42-sam/pym/_emerge/depgraph.py
--- portage-2.1.9.42/pym/_emerge/depgraph.py	2011-03-02 11:55:04.000000000 +0700
+++ portage-2.1.9.42-sam/pym/_emerge/depgraph.py	2011-04-13 01:42:36.000000000 +0700
@@ -2742,7 +2742,8 @@
 			mask_docs = True
 		else:
 			writemsg_stdout("\nemerge: there are no ebuilds to satisfy "+green(xinfo)+".\n", noiselevel=-1)
-			if isinstance(myparent, AtomArg):
+			if "misspell-suggestion" in pkgsettings.features and \
+				isinstance(myparent, AtomArg):
 				cp = myparent.atom.cp.lower()
 				cat, pkg = portage.catsplit(cp)
 				if cat == "null":
diff -u --recursive portage-2.1.9.42/pym/portage/const.py portage-2.1.9.42-sam/pym/portage/const.py
--- portage-2.1.9.42/pym/portage/const.py	2011-03-02 11:55:04.000000000 +0700
+++ portage-2.1.9.42-sam/pym/portage/const.py	2011-04-13 01:45:17.000000000 +0700
@@ -91,10 +91,10 @@
                            "digest", "distcc", "distlocks",
                            "fakeroot", "fail-clean", "fixpackages", "getbinpkg",
                            "installsources", "keeptemp", "keepwork", "fixlafiles", "lmirror",
-                           "metadata-transfer", "mirror", "multilib-strict", "news",
-                           "noauto", "noclean", "nodoc", "noinfo", "noman", "nostrip",
-                           "notitles", "parallel-fetch", "parse-eapi-ebuild-head",
-                           "prelink-checksums", "preserve-libs",
+                           "metadata-transfer", "mirror", "misspell-suggestions",
+			   "multilib-strict", "news", "noauto", "noclean", "nodoc", "noinfo",
+			   "noman", "nostrip", "notitles", "parallel-fetch",
+			   "parse-eapi-ebuild-head", "prelink-checksums", "preserve-libs",
                            "protect-owned", "python-trace", "sandbox",
                            "selinux", "sesandbox", "severe", "sfperms",
                            "sign", "skiprocheck", "split-elog", "split-log", "splitdebug",