diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 51579950144..c796c3dbc93 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -270,8 +270,8 @@ these floating NPC objects are for. More on that below.
 
 ** Define a shop/cashshop/itemshop/pointshop NPC.
 
--%TAB%shop%TAB%<NPC Name>%TAB%<sprite id>,<itemid>:<price>{,<itemid>:<price>...}
-<map name>,<x>,<y>,<facing>%TAB%shop%TAB%<NPC Name>%TAB%<sprite id>,<itemid>:<price>{,<itemid>:<price>...}
+-%TAB%shop%TAB%<NPC Name>%TAB%<sprite id>,<itemid>:<price>{,<itemid>:<price>...}{,<flag>}
+<map name>,<x>,<y>,<facing>%TAB%shop%TAB%<NPC Name>%TAB%<sprite id>,<itemid>:<price>{,<itemid>:<price>...}{,<flag>}
 
 -%TAB%cashshop%TAB%<NPC Name>%TAB%<sprite id>,<itemid>:<price>{,<itemid>:<price>...}
 <map name>,<x>,<y>,<facing>%TAB%cashshop%TAB%<NPC Name>%TAB%<sprite id>,<itemid>:<price>{,<itemid>:<price>...}
@@ -308,6 +308,11 @@ local account variables, or permanent global account variables. These variables
 must be of integer type, not string. 'discount' flag is an option, makes the price
 at that shop is affected by discount skill.
 
+'flag' for shop NPC means (bitmask):
+	1 = Disable Discount
+	2 = Disable Overcharge
+By default (if flag is undefined), the value always be 0.
+
 ** Define an warp/shop/cashshop/itemshop/pointshop/NPC duplicate.
 
 warp: <map name>,<x>,<y>,<facing>%TAB%duplicate(<label>)%TAB%<NPC Name>%TAB%<spanx>,<spany>
diff --git a/src/map/clif.c b/src/map/clif.c
index 9c39efde6da..869f6a9feda 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -1781,6 +1781,8 @@ void clif_buylist(struct map_session_data *sd, struct npc_data *nd)
 
 	c = 0;
 	discount = npc_shop_discount(nd->subtype,nd->u.shop.discount);
+	if (nd->u.shop.flag&1 && nd->subtype == NPCTYPE_SHOP) // Don't display Discount value [Cydh]
+		discount = false;
 	for( i = 0; i < nd->u.shop.count; i++ )
 	{
 		struct item_data* id = itemdb_exists(nd->u.shop.shop_item[i].nameid);
@@ -1801,15 +1803,21 @@ void clif_buylist(struct map_session_data *sd, struct npc_data *nd)
 
 /// Presents list of items, that can be sold to an NPC shop (ZC_PC_SELL_ITEMLIST).
 /// 00c7 <packet len>.W { <index>.W <price>.L <overcharge price>.L }*
-void clif_selllist(struct map_session_data *sd)
+void clif_selllist(struct map_session_data *sd, struct npc_data *nd)
 {
 	int fd,i,c=0,val;
+	bool overcharge = true;
 
 	nullpo_retv(sd);
+	nullpo_retv(nd);
 
 	fd=sd->fd;
 	WFIFOHEAD(fd, MAX_INVENTORY * 10 + 4);
 	WFIFOW(fd,0)=0xc7;
+
+	if (nd->u.shop.flag&2 && nd->subtype == NPCTYPE_SHOP) // Don't display Overcharged value [Cydh]
+		overcharge = false;
+
 	for( i = 0; i < MAX_INVENTORY; i++ )
 	{
 		if( sd->status.inventory[i].nameid > 0 && sd->inventory_data[i] )
@@ -1828,7 +1836,7 @@ void clif_selllist(struct map_session_data *sd)
 				continue;
 			WFIFOW(fd,4+c*10)=i+2;
 			WFIFOL(fd,6+c*10)=val;
-			WFIFOL(fd,10+c*10)=pc_modifysellvalue(sd,val);
+			WFIFOL(fd,10+c*10)=(overcharge)?pc_modifysellvalue(sd,val):val;
 			c++;
 		}
 	}
diff --git a/src/map/clif.h b/src/map/clif.h
index 3ab83ebd017..ba34c02f980 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -434,7 +434,7 @@ void clif_slide(struct block_list *bl, int x, int y); // area
 void clif_fixpos(struct block_list *bl);	// area
 void clif_npcbuysell(struct map_session_data* sd, int id);	//self
 void clif_buylist(struct map_session_data *sd, struct npc_data *nd);	//self
-void clif_selllist(struct map_session_data *sd);	//self
+void clif_selllist(struct map_session_data *sd, struct npc_data *nd);	//self
 void clif_scriptmes(struct map_session_data *sd, int npcid, const char *mes);	//self
 void clif_scriptnext(struct map_session_data *sd,int npcid);	//self
 void clif_scriptclose(struct map_session_data *sd, int npcid);	//self
diff --git a/src/map/npc.c b/src/map/npc.c
index 00ff00d2118..77d99f2ac87 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -1321,7 +1321,7 @@ int npc_buysellsel(struct map_session_data* sd, int id, int type)
 	if (type==0) {
 		clif_buylist(sd,nd);
 	} else {
-		clif_selllist(sd);
+		clif_selllist(sd,nd);
 	}
 	return 0;
 }
@@ -1589,7 +1589,8 @@ int npc_buylist(struct map_session_data* sd, int n, unsigned short* item_list)
 				return 2;
 		}
 
-		if (npc_shop_discount(nd->subtype,nd->u.shop.discount))
+		// No Discount [Cydh]
+		if ((!(nd->u.shop.flag&1) && nd->subtype == NPCTYPE_SHOP) || (nd->subtype != NPCTYPE_SHOP && npc_shop_discount(nd->subtype,nd->u.shop.discount)))
 			value = pc_modifybuyvalue(sd,value);
 
 		z += (double)value * amount;
@@ -1813,7 +1814,11 @@ int npc_selllist(struct map_session_data* sd, int n, unsigned short* item_list)
 			continue;
 		}
 
-		value = pc_modifysellvalue(sd, sd->inventory_data[idx]->value_sell);
+		// No Overcharge [Cydh]
+		if ((!(nd->u.shop.flag&2) && nd->subtype == NPCTYPE_SHOP) || nd->subtype != NPCTYPE_SHOP)
+			value = pc_modifysellvalue(sd, sd->inventory_data[idx]->value_sell);
+		else
+			value = sd->inventory_data[idx]->value_sell;
 
 		z+= (double)value*amount;
 	}
@@ -2369,8 +2374,8 @@ static const char* npc_parse_warp(char* w1, char* w2, char* w3, char* w4, const
 /**
  * Parses a shop/cashshop npc.
  * Line definition :
- * <map name>,<x>,<y>,<facing>%TAB%shop%TAB%<NPC Name>%TAB%<sprite id>,<itemid>:<price>{,<itemid>:<price>...}
- * <map name>,<x>,<y>,<facing>%TAB%cashshop%TAB%<NPC Name>%TAB%<sprite id>,<itemid>:<price>{,<itemid>:<price>...}
+ * <map name>,<x>,<y>,<facing>%TAB%shop%TAB%<NPC Name>%TAB%<sprite id>,<itemid>:<price>{,<itemid>:<price>...}{,<flag>}
+ * <map name>,<x>,<y>,<facing>%TAB%cashshop%TAB%<NPC Name>%TAB%<sprite id>,<itemid>:<price>{,<itemid>:<price>...}{,<flag>}
  * <map name>,<x>,<y>,<facing>%TAB%itemshop%TAB%<NPC Name>%TAB%<sprite id>,<costitemid>{:<discount>},<itemid>:<price>{,<itemid>:<price>...}
  * <map name>,<x>,<y>,<facing>%TAB%pointshop%TAB%<NPC Name>%TAB%<sprite id>,<costvariable>{:<discount>},<itemid>:<price>{,<itemid>:<price>...}
  * @param w1 : word 1 before tab (<from map name>,<x>,<y>,<facing>)
@@ -2472,10 +2477,18 @@ static const char* npc_parse_shop(char* w1, char* w2, char* w3, char* w4, const
 		if( p == NULL )
 			break;
 		if( sscanf(p, ",%hu:%d", &nameid2, &value) != 2 ) {
-			ShowError("npc_parse_shop: Invalid item definition in file '%s', line '%d'. Ignoring the rest of the line...\n * w1=%s\n * w2=%s\n * w3=%s\n * w4=%s\n", filepath, strline(buffer,start-buffer), w1, w2, w3, w4);
-			break;
+			// Set shop flag [Cydh]
+			if (nameid2 != 0) {
+				ShowInfo("Shop at '"CL_WHITE"%s#L%d"CL_RESET"' Discount: "CL_WHITE"%s"CL_RESET", Overcharge: "CL_WHITE"%s"CL_RESET".\n",
+					filepath, strline(buffer,start-buffer), nameid2&1 ? "NO" : "YES", nameid2&2 ? "NO" : "YES");
+				nd->u.shop.flag = (unsigned char)nameid2;
+			}
+			if (!nd->u.shop.flag) {
+				ShowError("npc_parse_shop: Invalid item definition in file '%s', line '%d'. Ignoring the rest of the line...\n * w1=%s\n * w2=%s\n * w3=%s\n * w4=%s\n", filepath, strline(buffer,start-buffer), w1, w2, w3, w4);
+				break;
+			}
 		}
-		if( (id = itemdb_exists(nameid2)) == NULL ) {
+		if( !nd->u.shop.flag && (id = itemdb_exists(nameid2)) == NULL ) {
 			ShowWarning("npc_parse_shop: Invalid sell item in file '%s', line '%d' (id '%hu').\n", filepath, strline(buffer,start-buffer), nameid2);
 			p = strchr(p+1,',');
 			continue;
diff --git a/src/map/npc.h b/src/map/npc.h
index 0b56bb1b94c..494d20e5386 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -62,6 +62,7 @@ struct npc_data {
 			unsigned short itemshop_nameid; // Item Shop cost item ID
 			char pointshop_str[32]; // Point Shop cost variable name
 			bool discount;
+			unsigned char flag; /// &1 No Discount, &2 No Overcharge (for SHOP only) [Cydh]
 		} shop;
 		struct {
 			short xs,ys; // OnTouch area radius