diff --git a/setup.py b/setup.py
index f25faa04f..2201da538 100644
--- a/setup.py
+++ b/setup.py
@@ -20,6 +20,8 @@
 
 platform_supported = False
 
+lib_talib_name = 'ta-lib'               # the name as of TA-Lib 0.6.1
+
 if any(s in sys.platform for s in ['darwin', 'linux', 'bsd', 'sunos']):
     platform_supported = True
     include_dirs = [
@@ -43,16 +45,16 @@
 
 elif sys.platform == "win32":
     platform_supported = True
-    lib_talib_name = 'ta_libc_cdr'
+    lib_talib_name = 'ta-lib-static'
     include_dirs = [
         r"c:\ta-lib\c\include",
-        r"c:\Program Files\TA-Lib\include"
-        r"c:\Program Files (x86)\TA-Lib\include"
+        r"c:\Program Files\TA-Lib\include",
+        r"c:\Program Files (x86)\TA-Lib\include",
     ]
     library_dirs = [
-        r"c:\ta-lib\c\lib"
-        r"c:\Program Files\TA-Lib\lib"
-        r"c:\Program Files (x86)\TA-Lib\lib"
+        r"c:\ta-lib\c\lib",
+        r"c:\Program Files\TA-Lib\lib",
+        r"c:\Program Files (x86)\TA-Lib\lib",
     ]
 
 if 'TA_INCLUDE_PATH' in os.environ:
@@ -70,8 +72,6 @@
 except ImportError:
     has_cython = False
 
-lib_talib_name = 'ta-lib'               # the name as of TA-Lib 0.6.1
-
 for path in library_dirs:
     try:
         files = os.listdir(path)