diff --git a/conf/atcommands.yml b/conf/atcommands.yml
index b6b65281f05..b034d35c9c6 100644
--- a/conf/atcommands.yml
+++ b/conf/atcommands.yml
@@ -918,6 +918,11 @@ Body:
   - Command: reloadbattleconf
     Help: |
       Reload battle settings.
+  - Command: reloadcashdb
+    Aliases:
+      - reloadcashshop
+    Help: |
+      Reload cash shop database.
   - Command: reloadinstancedb
     Help: |
       Reload instance database.
@@ -956,6 +961,7 @@ Body:
       atcommand       battleconf     statusdb
       pcdb                    motd             script
       questdb              msgconf       packetdb
+      cashdb
   - Command: langtype
     Help: |
       Params: <language>
diff --git a/conf/msg_conf/map_msg.conf b/conf/msg_conf/map_msg.conf
index c9eb4763547..488ce9d9231 100644
--- a/conf/msg_conf/map_msg.conf
+++ b/conf/msg_conf/map_msg.conf
@@ -933,7 +933,10 @@
 // NoBank Mapflag
 831: You cannot use the Bank on this map.
 
-//832-899 free
+// @reloadcashdb
+832: Cash shop database has been reloaded.
+
+//833-899 free
 
 //------------------------------------
 // More atcommands message
diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp
index 8b6d8bd165d..effcede5efc 100644
--- a/src/map/atcommand.cpp
+++ b/src/map/atcommand.cpp
@@ -37,6 +37,7 @@
 #include "instance.hpp"
 #include "intif.hpp"
 #include "itemdb.hpp" // MAX_ITEMGROUP
+#include "cashshop.hpp"
 #include "log.hpp"
 #include "mail.hpp"
 #include "map.hpp"
@@ -4212,6 +4213,9 @@ ACMD_FUNC(reload) {
 	if (strstr(command, "itemdb") || strncmp(message, "itemdb", 4) == 0) {
 		itemdb_reload();
 		clif_displaymessage(fd, msg_txt(sd,97)); // Item database has been reloaded.
+	} else if (strstr(command, "cashdb") || strncmp(message, "cashdb", 4) == 0) {
+		cashshop_reloaddb();
+		clif_displaymessage( fd, msg_txt( sd, 832 ) ); // Cash shop database has been reloaded.
 	} else if (strstr(command, "mobdb") || strncmp(message, "mobdb", 3) == 0) {
 		mob_reload();
 		pet_db.reload();
@@ -11076,6 +11080,7 @@ void atcommand_basecommands(void) {
 		ACMD_DEF(recallall),
 		ACMD_DEFR(reload,ATCMD_NOSCRIPT),
 		ACMD_DEF2("reloaditemdb", reload),
+		ACMD_DEF2("reloadcashdb", reload),
 		ACMD_DEF2("reloadmobdb", reload),
 		ACMD_DEF2("reloadskilldb", reload),
 		ACMD_DEF2R("reloadscript", reload, ATCMD_NOSCRIPT),