diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23ef9c5a4..698d3a4e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,10 +29,18 @@ ENDIF(HAVE_LIBBSD)
 
 endif (MSVC)
 
+if (MSVC)
+find_package (PDCurses)
+SET(CURSES_FOUND ${PDCURSES_FOUND})
+SET(CURSES_LIBRARIES ${PDCURSES_LIBRARY})
+SET(CURSES_INCLUDE_DIR ${PDCURSES_INCLUDE_DIR})
+else (MSVC)
+find_package (Curses)
+endif (MSVC)
+
 find_package (SQLite3)
 find_package (BerkeleyDB)
-find_package (Curses)
-find_package (LibXml2)
+find_package (LibXml2 REQUIRED)
 find_package (ToLua REQUIRED)
 if (TOLUA_FOUND)
 if (${TOLUA_VERSION_STRING} VERSION_GREATER "5.2")
diff --git a/cmake/Modules/FindPDCurses.cmake b/cmake/Modules/FindPDCurses.cmake
new file mode 100644
index 000000000..1e326f4fd
--- /dev/null
+++ b/cmake/Modules/FindPDCurses.cmake
@@ -0,0 +1,38 @@
+# Locate PDCurses library
+# This module defines
+# PDCURSES_LIBRARIES, the name of the library to link against
+# PDCURSES_FOUND, if false, do not try to link to PDCurses
+# PDCURSES_INCLUDE_DIR, where to find curses.h
+
+FIND_PATH(PDCURSES_INCLUDE_DIR curses.h
+  HINTS
+  $ENV{PDCURSESDIR}
+  PATH_SUFFIXES include/pdcurses include)
+
+FIND_LIBRARY(PDCURSES_LIBRARY
+  NAMES pdcurses
+  HINTS
+  $ENV{PDCURSESDIR}
+  PATH_SUFFIXES lib64 lib)
+
+FIND_LIBRARY(PDCURSES_PANEL_LIBRARY
+  NAMES panel
+  HINTS
+  $ENV{PDCURSESDIR}
+  PATH_SUFFIXES lib64 lib)
+
+IF(PDCURSES_LIBRARY)
+  SET(PDCURSES_LIBRARIES ${PDCURSES_LIBRARY})
+  IF(PDCURSES_PANEL_LIBRARY)
+    SET(PDCURSES_LIBRARIES ${PDCURSES_LIBRARIES} ${PDCURSES_PANEL_LIBRARY})
+  ENDIF(PDCURSES_PANEL_LIBRARY)
+ENDIF(PDCURSES_LIBRARY)
+
+SET(PDCURSES_FOUND "NO")
+IF(PDCURSES_INCLUDE_DIR AND PDCURSES_LIBRARY)
+#  message(STATUS "Found PDCurses library: ${PDCURSES_LIBRARIES}")
+  # Set the final string here so the GUI reflects the final state.
+  SET(PDCURSES_LIBRARIES PDCURSES_LIBRARY} CACHE STRING "Where the PDCurses Library can be found")
+
+  SET(PDCURSES_FOUND "YES")
+ENDIF(PDCURSES_INCLUDE_DIR AND PDCURSES_LIBRARY)
diff --git a/vs2015-build.bat b/vs2015-build.bat
index 262d498bf..1ad2c8da2 100644
--- a/vs2015-build.bat
+++ b/vs2015-build.bat
@@ -9,5 +9,5 @@ IF exist build-vs%VSVERSION% goto HAVEDIR
 mkdir build-vs%VSVERSION%
 :HAVEDIR
 cd build-vs%VSVERSION%
-"%ProgramFiles%\CMake\bin\cmake.exe" -G "Visual Studio %VSVERSION%" -DCMAKE_PREFIX_PATH="%ProgramFiles(x86)%/Lua/5.1;%ERESSEA%/dependencies-win32" -DCMAKE_MODULE_PATH="%SRCDIR%/cmake/Modules" -DCMAKE_SUPPRESS_REGENERATION=TRUE ..
+"%ProgramFiles%\CMake\bin\cmake.exe" -G "Visual Studio %VSVERSION%" -DCMAKE_PREFIX_PATH="%ProgramFiles(x86)%\Lua\5.1;%ERESSEA%\dependencies-win32" -DCMAKE_SUPPRESS_REGENERATION=TRUE ..
 PAUSE