diff --git a/setup.py b/setup.py
index 9eec9adb34798e7490b853de1925a67ff3f61c33_c2V0dXAucHk=..f0ffaca937924bf60442a070d363675ba1cbe726_c2V0dXAucHk= 100644
--- a/setup.py
+++ b/setup.py
@@ -37,8 +37,8 @@
     """ Windows settings.
     """
     if bits == 64:
-        library_dirs = [r'c:\Program Files (x86)\IBM\WebSphere MQ\tools\Lib64',
-                        r'{}\tools\Lib64'.format(os.environ['MQ_FILE_PATH'])]
-        include_dirs = [r'c:\Program Files (x86)\IBM\WebSphere MQ\tools\c\include',
-                        r'{}\tools\c\include'.format(os.environ['MQ_FILE_PATH'])]
+        library_dirs = [r'{}\tools\Lib64'.format(os.environ.get('MQ_FILE_PATH', '.')),
+                        r'c:\Program Files (x86)\IBM\WebSphere MQ\tools\Lib64']
+        include_dirs = [r'{}\tools\c\include'.format(os.environ.get('MQ_FILE_PATH', '.')),
+                        r'c:\Program Files (x86)\IBM\WebSphere MQ\tools\c\include']
     else:
@@ -44,8 +44,8 @@
     else:
-        library_dirs = [r'c:\Program Files\IBM\WebSphere MQ\Tools\Lib',
-                        r'{}\tools\Lib'.format(os.environ['MQ_FILE_PATH'])]
-        include_dirs = [r'c:\Program Files\IBM\WebSphere MQ\tools\c\include',
-                        r'{}\tools\c\include'.format(os.environ['MQ_FILE_PATH'])]
+        library_dirs = [r'{}\tools\Lib'.format(os.environ.get('MQ_FILE_PATH', '.')),
+                        r'c:\Program Files\IBM\WebSphere MQ\Tools\Lib']
+        include_dirs = [r'{}\tools\c\include'.format(os.environ.get('MQ_FILE_PATH', '.')),
+                        r'c:\Program Files\IBM\WebSphere MQ\tools\c\include']
 
     if bindings_mode:
         libraries = ['mqm']
@@ -61,5 +61,6 @@
     """ SunOS and z/Linux settings.
     """
     if bits == 64:
-        library_dirs = ['/opt/mqm/lib64']
+        library_dirs = ['{}/lib64'.format(os.environ.get('MQ_FILE_PATH', '.')),
+                        '/opt/mqm/lib64']
     else:
@@ -65,3 +66,4 @@
     else:
-        library_dirs = ['/opt/mqm/lib']
+        library_dirs = ['{}/lib'.format(os.environ.get('MQ_FILE_PATH', '.')),
+                        '/opt/mqm/lib']
 
@@ -67,4 +69,5 @@
 
-    include_dirs = ['/opt/mqm/inc']
+    include_dirs = ['{}/inc'.format(os.environ.get('MQ_FILE_PATH', '.')),
+                    '/opt/mqm/inc']
 
     if bindings_mode:
@@ -69,6 +72,6 @@
 
     if bindings_mode:
-        libraries = ['mqm','mqmcs','mqmzse']
+        libraries = ['mqm', 'mqmcs', 'mqmzse']
     else:
         libraries = ['mqic']
 
@@ -78,5 +81,6 @@
     """ AIX settings.
     """
     if bits == 64:
-        library_dirs = ['/usr/mqm/lib64']
+        library_dirs = ['{}/lib64'.format(os.environ.get('MQ_FILE_PATH', '.')),
+                        '/usr/mqm/lib64']
     else:
@@ -82,3 +86,4 @@
     else:
-        library_dirs = ['/usr/mqm/lib']
+        library_dirs = ['{}/lib'.format(os.environ.get('MQ_FILE_PATH', '.')),
+                        '/usr/mqm/lib']
 
@@ -84,5 +89,6 @@
 
-    include_dirs = ['/usr/mqm/inc']
+    include_dirs = ['{}/inc'.format(os.environ.get('MQ_FILE_PATH', '.')),
+                    '/usr/mqm/inc']
 
     if bindings_mode:
         libraries = ['mqm_r']
@@ -95,5 +101,6 @@
     """ Generic UNIX, including Linux, settings.
     """
     if bits == 64:
-        library_dirs = ['/opt/mqm/lib64']
+        library_dirs = ['{}/lib64'.format(os.environ.get('MQ_FILE_PATH', '.')),
+                        '/opt/mqm/lib64']
     else:
@@ -99,3 +106,4 @@
     else:
-        library_dirs = ['/opt/mqm/lib']
+        library_dirs = ['{}/lib'.format(os.environ.get('MQ_FILE_PATH', '.')),
+                        '/opt/mqm/lib']
 
@@ -101,5 +109,6 @@
 
-    include_dirs = ['/opt/mqm/inc']
+    include_dirs = ['{}/inc'.format(os.environ.get('MQ_FILE_PATH', '.')),
+                    '/opt/mqm/inc']
 
     if bindings_mode:
         libraries = ['mqm_r']
@@ -146,4 +155,5 @@
 else:
 
     has_generic_lib = os.path.exists('/opt/mqm/lib64') if bits == 64 else os.path.exists('/opt/mqm/lib')
+    has_mq_file_path = os.environ.get('MQ_FILE_PATH', False)
 
@@ -149,5 +159,5 @@
 
-    if has_generic_lib:
+    if has_generic_lib or has_mq_file_path:
         library_dirs, include_dirs, libraries = get_generic_unix_settings()
 
     else: