diff --git a/JavSP.py b/JavSP.py
index 78fed24c4..83736fbad 100644
--- a/JavSP.py
+++ b/JavSP.py
@@ -149,10 +149,20 @@ def info_summary(movie: Movie, all_info: Dict[str, MovieInfo]):
     # genre
     if 'javdb' in all_info:
         final_info.genre = all_info['javdb'].genre
+        if cfg.NFO.add_producer_publisher_to_genre:
+            if all_info['javdb'].publisher:            
+                final_info.genre.append("发行:{}".format(all_info['javdb'].publisher))
+            if all_info['javdb'].producer:     
+                final_info.genre.append("片商:{}".format(all_info['javdb'].producer))
     else:
         for name, data in all_info.items():
             if data.genre != None:
                 final_info.genre = all_info[name].genre
+                if cfg.NFO.add_producer_publisher_to_genre:
+                    if all_info[name].publisher:            
+                        final_info.genre.append("发行:{}".format(all_info[name].publisher))
+                    if all_info[name].producer:     
+                        final_info.genre.append("片商:{}".format(all_info[name].producer))
                 break
 
     if not final_info.genre:
@@ -161,7 +171,7 @@ def info_summary(movie: Movie, all_info: Dict[str, MovieInfo]):
         final_info.genre.append('内嵌字幕')
     if movie.uncensored:
         final_info.genre.append('无码流出/破解')
-
+    
     ########## 移除所有抓取器数据中，标题尾部的女优名 ##########
     if cfg.Crawler.title__remove_actor:
         for name, data in all_info.items():
diff --git a/core/config.ini b/core/config.ini
index d13c7f6bd..ab9d1faa2 100644
--- a/core/config.ini
+++ b/core/config.ini
@@ -121,6 +121,8 @@ bing_key =
 [NFO]
 # 同时将genre写入到tag？
 add_genre_to_tag = yes
+# 是否将发行和片商写入到tag
+add_producer_publisher_to_genre = yes
 
 [Other]
 # 是否允许检查更新。如果允许，在有新版本时会显示提示信息和新版功能
diff --git a/core/config.py b/core/config.py
index 58c939212..9a9cc6e92 100644
--- a/core/config.py
+++ b/core/config.py
@@ -264,6 +264,7 @@ def norm_boolean(cfg: Config):
             ('Picture', 'use_big_cover'),
             ('Picture', 'use_ai_crop'),
             ('NFO', 'add_genre_to_tag'),
+            ('NFO', 'add_producer_publisher_to_genre'),
             ('Other', 'check_update'),
             ('Other', 'auto_update')
         ]: