diff --git a/plugins/hextray/hextray-xp.vcxproj b/plugins/hextray/hextray-xp.vcxproj
index 02d9333a..190055fe 100644
--- a/plugins/hextray/hextray-xp.vcxproj
+++ b/plugins/hextray/hextray-xp.vcxproj
@@ -47,11 +47,13 @@
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(HexChatBin)</OutDir>
     <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
+    <TargetName>hchextray</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(HexChatBin)</OutDir>
     <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
+    <TargetName>hchextray</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
diff --git a/plugins/hextray/hextray.vcxproj b/plugins/hextray/hextray.vcxproj
index 7b1e4c6b..7367db7c 100644
--- a/plugins/hextray/hextray.vcxproj
+++ b/plugins/hextray/hextray.vcxproj
@@ -44,11 +44,13 @@
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(HexChatBin)</OutDir>
     <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
+    <TargetName>hchextray</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(HexChatBin)</OutDir>
     <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
+    <TargetName>hchextray</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
diff --git a/plugins/hextray/resource.rc b/plugins/hextray/resource.rc
index d01642df..929ea2ad 100644
--- a/plugins/hextray/resource.rc
+++ b/plugins/hextray/resource.rc
@@ -240,7 +240,7 @@ BEGIN
             VALUE "FileVersion", "1, 2, 4, 0"
             VALUE "InternalName", "HexTray"
             VALUE "LegalCopyright", "Copyright © 2005"
-            VALUE "OriginalFilename", "hextray.dll"
+            VALUE "OriginalFilename", "hchextray.dll"
             VALUE "ProductName", "HexTray - HexChat Win32 System Tray Plugin"
             VALUE "ProductVersion", "1, 2, 4, 0"
         END
diff --git a/src/common/plugin.c b/src/common/plugin.c
index ac1bce45..2e30b955 100644
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -475,6 +475,7 @@ plugin_auto_load (session *sess)
 	for_files ("./plugins", "hcdoat.dll", plugin_auto_load_cb);
 	for_files ("./plugins", "hcexec.dll", plugin_auto_load_cb);
 	for_files ("./plugins", "hcfishlim.dll", plugin_auto_load_cb);
+	for_files ("./plugins", "hchextray.dll", plugin_auto_load_cb);
 	for_files ("./plugins", "hclua.dll", plugin_auto_load_cb);
 	for_files ("./plugins", "hcmpcinfo.dll", plugin_auto_load_cb);
 	for_files ("./plugins", "hcperl.dll", plugin_auto_load_cb);
@@ -485,7 +486,6 @@ plugin_auto_load (session *sess)
 	for_files ("./plugins", "hcwinamp.dll", plugin_auto_load_cb);
 	for_files ("./plugins", "hcsysinfo.dll", plugin_auto_load_cb);
 	for_files ("./plugins", "hcwmpa.dll", plugin_auto_load_cb);
-	for_files ("./plugins", "hextray.dll", plugin_auto_load_cb);
 
 	for_files (sub_dir, "*.dll", plugin_auto_load_cb);
 #else
diff --git a/src/common/util.c b/src/common/util.c
index 5980a791..535c00b2 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -1897,7 +1897,7 @@ int
 hextray_mode ()
 {
 #ifdef WIN32
-	if ((_access( "plugins/hextray.dll", 0 )) != -1)
+	if ((_access( "plugins/hchextray.dll", 0 )) != -1)
 	{
 		return 1;
 	}
diff --git a/win32/hexchat-xp.props b/win32/hexchat-xp.props
index 695a3ed4..3748fbf0 100644
--- a/win32/hexchat-xp.props
+++ b/win32/hexchat-xp.props
@@ -90,6 +90,7 @@ copy "$(HexChatBin)hcdns.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcdoat.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcexec.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcfishlim.dll" "$(HexChatRel)\plugins"
+copy "$(HexChatBin)hchextray.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hclua.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcmpcinfo.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcperl-512.dll" "$(HexChatRel)\plugins"
@@ -98,7 +99,6 @@ copy "$(HexChatBin)hcperl-516.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcpython.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hctcl.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcupd.dll" "$(HexChatRel)\plugins"
-copy "$(HexChatBin)hextray.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcwinamp.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcsysinfo.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcwmpa.dll" "$(HexChatRel)\plugins"
diff --git a/win32/hexchat.props b/win32/hexchat.props
index 286259f0..1540d47a 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -103,6 +103,7 @@ copy "$(HexChatBin)hcdns.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcdoat.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcexec.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcfishlim.dll" "$(HexChatRel)\plugins"
+copy "$(HexChatBin)hchextray.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hclua.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcmpcinfo.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcperl-512.dll" "$(HexChatRel)\plugins"
@@ -111,7 +112,6 @@ copy "$(HexChatBin)hcperl-516.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcpython.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hctcl.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcupd.dll" "$(HexChatRel)\plugins"
-copy "$(HexChatBin)hextray.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcwinamp.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcsysinfo.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcwmpa.dll" "$(HexChatRel)\plugins"
diff --git a/win32/installer/hexchat-x64.skel.iss b/win32/installer/hexchat-x64.skel.iss
index 05bef7ca..e43b80e2 100644
--- a/win32/installer/hexchat-x64.skel.iss
+++ b/win32/installer/hexchat-x64.skel.iss
@@ -175,7 +175,7 @@ Source: "plugins\hcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion;
 Source: "etc\system.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\sysinfo
 Source: "plugins\hcsysinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sysinfo
 ;Source: "plugins\hcsasl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sasl
-Source: "plugins\hextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray
+Source: "plugins\hchextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray
 Source: "plugins\hcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa
 
 Source: "plugins\hclua.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\lua
diff --git a/win32/installer/hexchat-x86.skel.iss b/win32/installer/hexchat-x86.skel.iss
index 875a90f4..8875ebad 100644
--- a/win32/installer/hexchat-x86.skel.iss
+++ b/win32/installer/hexchat-x86.skel.iss
@@ -176,7 +176,7 @@ Source: "plugins\hcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion;
 Source: "etc\system.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\sysinfo
 Source: "plugins\hcsysinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sysinfo
 ;Source: "plugins\hcsasl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sasl
-Source: "plugins\hextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray
+Source: "plugins\hchextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray
 Source: "plugins\hcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa
 
 Source: "plugins\hclua.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\lua
diff --git a/win32/installer/hexchat-xp-x64.skel.iss b/win32/installer/hexchat-xp-x64.skel.iss
index 05bef7ca..e43b80e2 100644
--- a/win32/installer/hexchat-xp-x64.skel.iss
+++ b/win32/installer/hexchat-xp-x64.skel.iss
@@ -175,7 +175,7 @@ Source: "plugins\hcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion;
 Source: "etc\system.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\sysinfo
 Source: "plugins\hcsysinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sysinfo
 ;Source: "plugins\hcsasl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sasl
-Source: "plugins\hextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray
+Source: "plugins\hchextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray
 Source: "plugins\hcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa
 
 Source: "plugins\hclua.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\lua
diff --git a/win32/installer/hexchat-xp-x86.skel.iss b/win32/installer/hexchat-xp-x86.skel.iss
index 875a90f4..8875ebad 100644
--- a/win32/installer/hexchat-xp-x86.skel.iss
+++ b/win32/installer/hexchat-xp-x86.skel.iss
@@ -176,7 +176,7 @@ Source: "plugins\hcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion;
 Source: "etc\system.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\sysinfo
 Source: "plugins\hcsysinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sysinfo
 ;Source: "plugins\hcsasl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sasl
-Source: "plugins\hextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray
+Source: "plugins\hchextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray
 Source: "plugins\hcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa
 
 Source: "plugins\hclua.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\lua