diff --git a/MOVED b/MOVED
index 7b914c2d47c6..d74a9b4c513c 100644
--- a/MOVED
+++ b/MOVED
@@ -12752,3 +12752,5 @@ sysutils/djmount||2019-05-15|Has expired: Unmaintained upstream and does not bui
 multimedia/vdr-plugin-upnp||2019-05-15|Has expired: Unmaintained upstream and does not build with upnp >= 1.8
 databases/puppetdb-cli|databases/rubygem-puppetdb_cli|2019-05-15|puppetdb-cli was rewritten in Ruby
 devel/modules2tuple|ports-mgmt/modules2tuple|2019-05-15|Moved to ports-mgmt category
+textproc/zsh-syntax-highlighting|shells/zsh-syntax-highlighting|2019-05-15|Moved to shells category
+textproc/zsh-autosuggestions|shells/zsh-autosuggestions|2019-05-15|Moved to shells category
diff --git a/shells/Makefile b/shells/Makefile
index 51696f1e8dc7..44b5c45f0946 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -55,7 +55,9 @@
     SUBDIR += xonsh
     SUBDIR += zsh
     SUBDIR += zsh-antigen
+    SUBDIR += zsh-autosuggestions
     SUBDIR += zsh-completions
     SUBDIR += zsh-navigation-tools
+    SUBDIR += zsh-syntax-highlighting
 
 .include <bsd.port.subdir.mk>
diff --git a/textproc/zsh-autosuggestions/Makefile b/shells/zsh-autosuggestions/Makefile
similarity index 100%
rename from textproc/zsh-autosuggestions/Makefile
rename to shells/zsh-autosuggestions/Makefile
diff --git a/textproc/zsh-autosuggestions/distinfo b/shells/zsh-autosuggestions/distinfo
similarity index 100%
rename from textproc/zsh-autosuggestions/distinfo
rename to shells/zsh-autosuggestions/distinfo
diff --git a/textproc/zsh-autosuggestions/files/pkg-message.in b/shells/zsh-autosuggestions/files/pkg-message.in
similarity index 100%
rename from textproc/zsh-autosuggestions/files/pkg-message.in
rename to shells/zsh-autosuggestions/files/pkg-message.in
diff --git a/textproc/zsh-autosuggestions/pkg-descr b/shells/zsh-autosuggestions/pkg-descr
similarity index 100%
rename from textproc/zsh-autosuggestions/pkg-descr
rename to shells/zsh-autosuggestions/pkg-descr
diff --git a/textproc/zsh-syntax-highlighting/Makefile b/shells/zsh-syntax-highlighting/Makefile
similarity index 100%
rename from textproc/zsh-syntax-highlighting/Makefile
rename to shells/zsh-syntax-highlighting/Makefile
diff --git a/textproc/zsh-syntax-highlighting/distinfo b/shells/zsh-syntax-highlighting/distinfo
similarity index 100%
rename from textproc/zsh-syntax-highlighting/distinfo
rename to shells/zsh-syntax-highlighting/distinfo
diff --git a/textproc/zsh-syntax-highlighting/files/pkg-message.in b/shells/zsh-syntax-highlighting/files/pkg-message.in
similarity index 100%
rename from textproc/zsh-syntax-highlighting/files/pkg-message.in
rename to shells/zsh-syntax-highlighting/files/pkg-message.in
diff --git a/textproc/zsh-syntax-highlighting/pkg-descr b/shells/zsh-syntax-highlighting/pkg-descr
similarity index 100%
rename from textproc/zsh-syntax-highlighting/pkg-descr
rename to shells/zsh-syntax-highlighting/pkg-descr
diff --git a/textproc/zsh-syntax-highlighting/pkg-plist b/shells/zsh-syntax-highlighting/pkg-plist
similarity index 100%
rename from textproc/zsh-syntax-highlighting/pkg-plist
rename to shells/zsh-syntax-highlighting/pkg-plist
diff --git a/textproc/Makefile b/textproc/Makefile
index f30272439710..ed01b6dda178 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1851,8 +1851,6 @@
     SUBDIR += yould
     SUBDIR += zenxml
     SUBDIR += zorba
-    SUBDIR += zsh-autosuggestions
-    SUBDIR += zsh-syntax-highlighting
     SUBDIR += zu-aspell
     SUBDIR += zu-hunspell
     SUBDIR += zxing-cpp