diff --git a/_goto b/_goto
deleted file mode 100644
index 20c086b..0000000
--- a/_goto
+++ /dev/null
@@ -1,7 +0,0 @@
-#compdef _goto goto
-function _goto {
-  for label in $(_awk '{print $1;}' `_goto_file`)
-  do
-    compadd "$@" "${label}"
-  done
-};
diff --git a/goto.plugin.zsh b/goto.plugin.zsh
index e031a01..e6e547e 100644
--- a/goto.plugin.zsh
+++ b/goto.plugin.zsh
@@ -44,3 +44,12 @@ function goto {
     fi
   fi
 };
+
+function _goto {
+  for label in $(awk '{print $1}' `_goto_file`)
+  do
+    compadd "$@" $label
+  done
+};
+
+compdef _goto goto