diff --git a/README.md b/README.md
index 5498bba8..12199293 100644
--- a/README.md
+++ b/README.md
@@ -247,6 +247,7 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `vagrant_up` – starts up the vagrant instance;
 * `whois` – fixes `whois` command;
 * `workon_doesnt_exists` – fixes `virtualenvwrapper` env name os suggests to create new.
+* `yarn_alias` – fixes aliased `yarn` commands like `yarn ls`;
 
 Enabled by default only on specific platforms:
 
diff --git a/tests/rules/test_yarn_alias.py b/tests/rules/test_yarn_alias.py
new file mode 100644
index 00000000..83d38117
--- /dev/null
+++ b/tests/rules/test_yarn_alias.py
@@ -0,0 +1,22 @@
+import pytest
+from thefuck.rules.yarn_alias import match, get_new_command
+from tests.utils import Command
+
+
+stderr_remove = 'error Did you mean `yarn remove`?'
+
+stderr_list = 'error Did you mean `yarn list`?'
+
+
+@pytest.mark.parametrize('command', [
+    Command(script='yarn rm', stderr=stderr_remove),
+    Command(script='yarn ls', stderr=stderr_list)])
+def test_match(command):
+    assert match(command)
+
+
+@pytest.mark.parametrize('command, new_command', [
+    (Command('yarn rm', stderr=stderr_remove), 'yarn remove'),
+    (Command('yarn ls', stderr=stderr_list), 'yarn list')])
+def test_get_new_command(command, new_command):
+    assert get_new_command(command) == new_command
diff --git a/thefuck/rules/yarn_alias.py b/thefuck/rules/yarn_alias.py
new file mode 100644
index 00000000..4c1a584b
--- /dev/null
+++ b/thefuck/rules/yarn_alias.py
@@ -0,0 +1,14 @@
+import re
+from thefuck.utils import replace_argument, for_app
+
+
+@for_app('yarn', at_least=1)
+def match(command):
+    return ('Did you mean' in command.stderr)
+
+
+def get_new_command(command):
+    broken = command.script_parts[1]
+    fix = re.findall(r'Did you mean `yarn ([^`]*)`', command.stderr)[0]
+
+    return replace_argument(command.script, broken, fix)