diff --git a/modules/command-not-found/README.md b/modules/command-not-found/README.md
index 91a67f25..0e0fb60b 100644
--- a/modules/command-not-found/README.md
+++ b/modules/command-not-found/README.md
@@ -1,7 +1,7 @@
 Command-Not-Found
 =================
 
-Loads the [command-not-found][1] tool on Debian-based distributions.
+Loads the [command-not-found][1] tool on Debian-based distributions or Arch Linux.
 
 Authors
 -------
diff --git a/modules/command-not-found/init.zsh b/modules/command-not-found/init.zsh
index 7b554e86..c1427815 100644
--- a/modules/command-not-found/init.zsh
+++ b/modules/command-not-found/init.zsh
@@ -6,9 +6,10 @@
 #
 
 # Return if requirements are not found.
-if [[ ! -s '/etc/zsh_command_not_found' ]]; then
+if [[ -s '/etc/zsh_command_not_found' ]]; then
+  source '/etc/zsh_command_not_found' # Debian-based distributions
+elif [[ -s '/usr/share/doc/pkgfile/command-not-found.zsh' ]]; then
+  source '/usr/share/doc/pkgfile/command-not-found.zsh' # Arch Linux
+else
   return 1
 fi
-
-source '/etc/zsh_command_not_found'
-