diff --git a/plugins/lua/lua.vcxproj b/plugins/lua/lua.vcxproj
new file mode 100644
index 00000000..22afe729
--- /dev/null
+++ b/plugins/lua/lua.vcxproj
@@ -0,0 +1,54 @@
+
+
+
+ v140
+ DynamicLibrary
+
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {4C0F3940-2EEE-4646-82F7-6CE75B9A72F4}
+ Win32Proj
+ lua
+
+
+
+
+
+
+ $(LuaOutput)
+ $(HexChatRel)plugins\
+
+
+
+ WIN32;NDEBUG;_WINDOWS;_USRDLL;$(OwnFlags);%(PreprocessorDefinitions)
+ $(Glib);$(LuaInclude);..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)
+
+
+ "$(LuaLib).lib";$(DepLibs);%(AdditionalDependencies)
+ $(DepsRoot)\lib;%(AdditionalLibraryDirectories)
+
+
+
+
+ WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;$(OwnFlags);%(PreprocessorDefinitions)
+ $(Glib);$(LuaInclude);..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)
+
+
+ "$(LuaLib).lib";$(DepLibs);%(AdditionalDependencies)
+ $(DepsRoot)\lib;%(AdditionalLibraryDirectories)
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/plugins/lua/lua.vcxproj.filters b/plugins/lua/lua.vcxproj.filters
new file mode 100644
index 00000000..9b41ebc0
--- /dev/null
+++ b/plugins/lua/lua.vcxproj.filters
@@ -0,0 +1,14 @@
+
+
+
+
+ {f4eaf231-f095-42d3-8427-b2b6006cacb1}
+
+
+ {0166c0f9-7968-4a09-9ef5-a5179c7746eb}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/common/plugin.c b/src/common/plugin.c
index 5fb864ae..be58f285 100644
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -455,6 +455,7 @@ plugin_auto_load (session *sess)
for_files (lib_dir, "hcdoat.dll", plugin_auto_load_cb);
for_files (lib_dir, "hcexec.dll", plugin_auto_load_cb);
for_files (lib_dir, "hcfishlim.dll", plugin_auto_load_cb);
+ for_files(lib_dir, "hclua.dll", plugin_auto_load_cb);
for_files (lib_dir, "hcmpcinfo.dll", plugin_auto_load_cb);
for_files (lib_dir, "hcperl.dll", plugin_auto_load_cb);
for_files (lib_dir, "hcpython2.dll", plugin_auto_load_cb);
diff --git a/win32/hexchat.props b/win32/hexchat.props
index 95521977..1503c201 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -29,6 +29,9 @@
$(YourPython3Path)\$(PlatformName)
python35
hcpython3
+ $(DepsRoot)\include\luajit-2.0
+ hclua
+ lua51
$(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2
$(DepsRoot)\include\gtk-2.0;$(DepsRoot)\lib\gtk-2.0\include;$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0
gtk-win32-2.0.lib;gdk-win32-2.0.lib;atk-1.0.lib;gio-2.0.lib;gdk_pixbuf-2.0.lib;pangowin32-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;libintl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib
diff --git a/win32/hexchat.sln b/win32/hexchat.sln
index 272c96df..e44acaac 100644
--- a/win32/hexchat.sln
+++ b/win32/hexchat.sln
@@ -131,6 +131,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libenchant_win8", "..\src\l
{87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "..\plugins\lua\lua.vcxproj", "{4C0F3940-2EEE-4646-82F7-6CE75B9A72F4}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Release|Win32 = Release|Win32
@@ -221,6 +223,10 @@ Global
{BF0EBC16-68AD-4CD1-864C-5B56836EBE2A}.Release|Win32.Build.0 = Release|Win32
{BF0EBC16-68AD-4CD1-864C-5B56836EBE2A}.Release|x64.ActiveCfg = Release|x64
{BF0EBC16-68AD-4CD1-864C-5B56836EBE2A}.Release|x64.Build.0 = Release|x64
+ {4C0F3940-2EEE-4646-82F7-6CE75B9A72F4}.Release|Win32.ActiveCfg = Release|Win32
+ {4C0F3940-2EEE-4646-82F7-6CE75B9A72F4}.Release|Win32.Build.0 = Release|Win32
+ {4C0F3940-2EEE-4646-82F7-6CE75B9A72F4}.Release|x64.ActiveCfg = Release|x64
+ {4C0F3940-2EEE-4646-82F7-6CE75B9A72F4}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -247,5 +253,6 @@ Global
{C2321A03-0BA7-45B3-8740-ABD82B36B0BF} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240}
{C53145CC-D021-40C9-B97C-0249AB9A43C9} = {561126F4-FA18-45FC-A2BF-8F858F161D6D}
{BF0EBC16-68AD-4CD1-864C-5B56836EBE2A} = {021EC1D0-FF67-4700-9AB2-EAABF1159C09}
+ {4C0F3940-2EEE-4646-82F7-6CE75B9A72F4} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240}
EndGlobalSection
EndGlobal
diff --git a/win32/installer/hexchat.iss.tt b/win32/installer/hexchat.iss.tt
index 36daa505..2b3ee59d 100644
--- a/win32/installer/hexchat.iss.tt
+++ b/win32/installer/hexchat.iss.tt
@@ -72,6 +72,7 @@ Name: "plugins\sysinfo"; Description: "SysInfo"; Types: custom; Flags: disableno
Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: disablenouninstallwarning
Name: "plugins\winamp"; Description: "Winamp"; Types: custom; Flags: disablenouninstallwarning
Name: "langs"; Description: "Language Interfaces"; Types: custom; Flags: disablenouninstallwarning
+Name: "langs\lua"; Description: "Lua"; Types: normal custom; Flags: disablenouninstallwarning
Name: "langs\perl"; Description: "Perl (requires Perl 5.20)"; Types: custom; Flags: disablenouninstallwarning
Name: "langs\python"; Description: "Python Interface"; Types: custom; Flags: disablenouninstallwarning
Name: "langs\python\python2"; Description: "Python (requires Python 2.7)"; Types: custom; Flags: disablenouninstallwarning exclusive
@@ -171,6 +172,7 @@ Source: "plugins\hcsysinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion;
Source: "plugins\hcpython2.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\python\python2
Source: "plugins\hcpython3.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\python\python3
Source: "plugins\hcperl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\perl
+Source: "plugins\hclua.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\lua
Source: "hexchat.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
Source: "hexchat-text.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: xctext