diff --git a/aliases/available/fuck.aliases.bash b/aliases/available/fuck.aliases.bash
index 54648931..16511c36 100644
--- a/aliases/available/fuck.aliases.bash
+++ b/aliases/available/fuck.aliases.bash
@@ -1,3 +1,2 @@
 # https://github.com/nvbn/thefuck
-alias fuck='eval $(thefuck $(fc -ln -1))'
 alias please='fuck'
diff --git a/plugins/available/fuck.plugin.bash b/plugins/available/fuck.plugin.bash
new file mode 100644
index 00000000..242a77df
--- /dev/null
+++ b/plugins/available/fuck.plugin.bash
@@ -0,0 +1,9 @@
+cite about-plugin
+about-plugin 'Initialization for fuck'
+
+# https://github.com/nvbn/thefuck
+
+if _command_exists thefuck; then
+  # shellcheck disable=SC2046
+  eval $(thefuck --alias)
+fi