diff --git a/build/release-x64.bat b/build/release-x64.bat
index 6bc3e137..0e3f4826 100644
--- a/build/release-x64.bat
+++ b/build/release-x64.bat
@@ -39,6 +39,6 @@ copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\xcpython.dll.x64
 copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\xctcl.dll.x64
 copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins\xcupd.dll.x64
 ::copy ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\xcxdcc.dll.x64
-::copy ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins\xtray.dll.x64
+copy ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins\xtray.dll.x64
 copy ..\plugins\winamp\xcwinamp.dll %XCHAT_DEST%\plugins\xcwinamp.dll.x64
 copy %DEPS_ROOT%\bin\lua51.dll %XCHAT_DEST%\lua51.dll.x64
diff --git a/build/release-x86.bat b/build/release-x86.bat
index 8eb1b019..cf0738ea 100644
--- a/build/release-x86.bat
+++ b/build/release-x86.bat
@@ -51,7 +51,7 @@ copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins
 copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins
 copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins
 ::copy ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins
-::copy ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins
+copy ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins
 copy ..\plugins\winamp\xcwinamp.dll %XCHAT_DEST%\plugins
 copy %DEPS_ROOT%\bin\lua51.dll %XCHAT_DEST%
 xcopy /q /s /i ..\po\locale %XCHAT_DEST%\locale
diff --git a/build/xchat-wdk.skel.iss b/build/xchat-wdk.skel.iss
index b529064b..5d994204 100644
--- a/build/xchat-wdk.skel.iss
+++ b/build/xchat-wdk.skel.iss
@@ -53,8 +53,8 @@ Name: "langs\tcl"; Description: "Tcl"; Types: full custom; Flags: disablenounins
 Name: x86; Description: "x86"; GroupDescription: "XChat-WDK version:"; Flags: exclusive unchecked
 Name: x64; Description: "x64"; GroupDescription: "XChat-WDK version:"; Flags: exclusive; Check: Is64BitInstallMode
 
-;Name: xtray; Description: "X-Tray"; GroupDescription: "Tray Icon"; Flags: exclusive
-;Name: noxtray; Description: "Plugin-Tray"; GroupDescription: "Tray Icon"; Flags: exclusive unchecked
+Name: noxtray; Description: "Plugin-Tray"; GroupDescription: "Tray Icon"; Flags: exclusive
+Name: xtray; Description: "X-Tray"; GroupDescription: "Tray Icon"; Flags: exclusive unchecked
 
 Name: perl510; Description: "5.10"; GroupDescription: "Perl version:"; Flags: exclusive unchecked; Components: langs\perl
 Name: perl512; Description: "5.12"; GroupDescription: "Perl version:"; Flags: exclusive; Components: langs\perl
@@ -225,10 +225,8 @@ Source: "plugins\xcperl-512.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcper
 
 
 
-;Source: "plugins\xtray.dll"; DestDir: "{app}\plugins"; Components: libs; Tasks: x86
-; and xtray
-;Source: "plugins\xtray.dll.x64"; DestDir: "{app}\plugins"; DestName: "xtray.dll"; Components: libs; Tasks: x64
-; and xtray
+Source: "plugins\xtray.dll"; DestDir: "{app}\plugins"; Components: libs; Tasks: x86 and xtray
+Source: "plugins\xtray.dll.x64"; DestDir: "{app}\plugins"; DestName: "xtray.dll"; Components: libs; Tasks: x64 and xtray
 
 [Icons]
 Name: "{group}\XChat-WDK"; Filename: "{app}\xchat.exe"; Tasks: not portable
diff --git a/plugins/makefile.mak b/plugins/makefile.mak
index 12298863..fc8ff658 100644
--- a/plugins/makefile.mak
+++ b/plugins/makefile.mak
@@ -11,8 +11,8 @@ all:
 	@-$(MAKE) /nologo /s /f makefile.mak $@
 #	@cd ..\xdcc
 #	@-$(MAKE) /nologo /s /f makefile.mak $@
-#	@cd ..\xtray
-#	@-$(MAKE) /nologo /s /f makefile.mak $@
+	@cd ..\xtray
+	@-$(MAKE) /nologo /s /f makefile.mak $@
 	@cd ..\winamp
 	@-$(MAKE) /nologo /s /f makefile.mak $@	
 
@@ -47,11 +47,11 @@ clean:
 #	@del xdcc\*.exp
 #	@del xdcc\*.lib
 #	@del xdcc\*.obj
-#	@del xtray\*.def
-#	@del xtray\*.dll
-#	@del xtray\*.exp
-#	@del xtray\*.lib
-#	@del xtray\*.obj
+	@del xtray\*.def
+	@del xtray\*.dll
+	@del xtray\*.exp
+	@del xtray\*.lib
+	@del xtray\*.obj
 	@del winamp\*.def
 	@del winamp\*.dll
 	@del winamp\*.exp