diff --git a/ShareX/Enums.cs b/ShareX/Enums.cs
index 7b3ddd0bc..563f62477 100644
--- a/ShareX/Enums.cs
+++ b/ShareX/Enums.cs
@@ -59,6 +59,8 @@ public enum SupportedLanguage
         Indonesian,
         [Description("Italiano (Italian)")]
         Italian,
+        [Description("日本語 (Japanese)")]
+        Japanese,
         [Description("한국어 (Korean)")]
         Korean,
         [Description("Español mexicano (Mexican Spanish)")]
diff --git a/ShareX/Forms/AboutForm.cs b/ShareX/Forms/AboutForm.cs
index 7eeb0fc97..e27c3f8b4 100644
--- a/ShareX/Forms/AboutForm.cs
+++ b/ShareX/Forms/AboutForm.cs
@@ -100,6 +100,7 @@ public AboutForm()
 {Resources.AboutForm_AboutForm_Language_es_MX}: https://github.com/absay
 {Resources.AboutForm_AboutForm_Language_fa_IR}: https://github.com/pourmand1376
 {Resources.AboutForm_AboutForm_Language_pt_PT}: https://github.com/FarewellAngelina
+{Resources.AboutForm_AboutForm_Language_ja_JP}: https://github.com/kanaxx
 
 {Resources.AboutForm_AboutForm_External_libraries}:
 
diff --git a/ShareX/LanguageHelper.cs b/ShareX/LanguageHelper.cs
index 1f1342601..9a6203834 100644
--- a/ShareX/LanguageHelper.cs
+++ b/ShareX/LanguageHelper.cs
@@ -98,6 +98,9 @@ public static Image GetLanguageIcon(SupportedLanguage language)
                 case SupportedLanguage.Italian:
                     icon = Resources.it;
                     break;
+                case SupportedLanguage.Japanese:
+                    icon = Resources.jp;
+                    break;
                 case SupportedLanguage.Korean:
                     icon = Resources.kr;
                     break;
@@ -167,6 +170,9 @@ public static string GetCultureName(SupportedLanguage language)
                 case SupportedLanguage.Italian:
                     cultureName = "it-IT";
                     break;
+                case SupportedLanguage.Japanese:
+                    cultureName = "ja-JP";
+                    break;
                 case SupportedLanguage.Korean:
                     cultureName = "ko-KR";
                     break;
diff --git a/ShareX/Properties/Resources.Designer.cs b/ShareX/Properties/Resources.Designer.cs
index bc0d2af84..54742ddc3 100644
--- a/ShareX/Properties/Resources.Designer.cs
+++ b/ShareX/Properties/Resources.Designer.cs
@@ -159,6 +159,15 @@ public static string AboutForm_AboutForm_Language_it_IT {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Japanese.
+        /// </summary>
+        public static string AboutForm_AboutForm_Language_ja_JP {
+            get {
+                return ResourceManager.GetString("AboutForm_AboutForm_Language_ja_JP", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Korean.
         /// </summary>
@@ -1716,6 +1725,16 @@ public static System.Drawing.Bitmap it {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap jp {
+            get {
+                object obj = ResourceManager.GetObject("jp", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/ShareX/Properties/Resources.resx b/ShareX/Properties/Resources.resx
index 1ac0142e6..d770648b3 100644
--- a/ShareX/Properties/Resources.resx
+++ b/ShareX/Properties/Resources.resx
@@ -1066,4 +1066,10 @@ Middle click to close</value>
   <data name="user-business" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\user-business.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="jp" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\jp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="AboutForm_AboutForm_Language_ja_JP" xml:space="preserve">
+    <value>Japanese</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ShareX/Resources/jp.png b/ShareX/Resources/jp.png
new file mode 100644
index 000000000..325fbad3f
Binary files /dev/null and b/ShareX/Resources/jp.png differ
diff --git a/ShareX/ShareX.csproj b/ShareX/ShareX.csproj
index 5afe75c44..37c60e1ef 100644
--- a/ShareX/ShareX.csproj
+++ b/ShareX/ShareX.csproj
@@ -1910,6 +1910,9 @@
   <ItemGroup>
     <None Include="Resources\user-business.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\jp.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>