diff --git a/portage/cnf/make.globals b/portage-sam/cnf/make.globals
index 95afb56..ddec18a 100644
--- a/portage/cnf/make.globals
+++ b/portage-sam/cnf/make.globals
@@ -52,9 +52,10 @@ FETCHCOMMAND_SFTP="bash -c \"x=\\\${2#sftp://} ; host=\\\${x%%/*} ; port=\\\${ho
 
 # Default user options
 FEATURES="assume-digests binpkg-logs distlocks fixpackages
-          fixlafiles news parallel-fetch protect-owned
-          sandbox sfperms strict unknown-features-warn unmerge-logs
-          unmerge-orphans userfetch"
+          fixlafiles news misspell-suggestions parallel-fetch
+          protect-owned sandbox sfperms strict 
+	  unknown-features-warn unmerge-logs unmerge-orphans
+	  userfetch"
 
 # Ignore file collisions in /lib/modules since files inside this directory
 # are never unmerged, and therefore collisions must be ignored in order for
diff --git a/portage/man/make.conf.5 b/portage-sam/man/make.conf.5
index cf8d217..441649f 100644
--- a/portage/man/make.conf.5
+++ b/portage-sam/man/make.conf.5
@@ -332,6 +332,9 @@ validation mechanism to work correctly.
 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 --git a/portage/pym/_emerge/depgraph.py b/portage-sam/pym/_emerge/depgraph.py
index 391c845..89043f7 100644
--- a/portage/pym/_emerge/depgraph.py
+++ b/portage-sam/pym/_emerge/depgraph.py
@@ -2741,7 +2741,8 @@ class depgraph(object):
 			mask_docs = True
 		else:
 			writemsg_stdout("\nemerge: there are no ebuilds to satisfy "+green(xinfo)+".\n", noiselevel=-1)
-			if isinstance(myparent, AtomArg):
+			if "misspell-suggestions" in pkgsettings.features and \
+				isinstance(myparent, AtomArg):
 				cp = myparent.atom.cp.lower()
 				cat, pkg = portage.catsplit(cp)
 				if cat == "null":
diff --git a/portage/pym/portage/const.py b/portage-sam/pym/portage/const.py
index b92149d..a892353 100644
--- a/portage/pym/portage/const.py
+++ b/portage-sam/pym/portage/const.py
@@ -91,10 +91,10 @@ SUPPORTED_FEATURES       = frozenset([
                            "digest", "distcc", "distlocks", "fakeroot",
                            "fail-clean", "fixpackages", "force-mirror", "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-suggestion",
+                           "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",