diff --git a/CHANGES.rst b/CHANGES.rst
index af79c90a..7c008210 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -52,6 +52,8 @@ Changes in this release include the following:
 * Fixed an issue where wx.lib.intctrl would erroneously attempt to use ``long``
   on Python3
 
+* Clear LIBPATH_PYEXT and LIB_PYEXT for linux builds too. (#904)
+
 * Added a dependency on the Pillow package since it's used in some wx.lib.agw
   modules. (PR #908)
 
diff --git a/README.rst b/README.rst
index a97aac0f..5d687e77 100644
--- a/README.rst
+++ b/README.rst
@@ -370,6 +370,8 @@ installed, if they are available. For example:
 * libwebkit2gtk-4.0-dev
 * libsdl2-dev
 
+If You use a custom built python in a non standard location, You need to
+compile python with the --enable-shared option.
 
 **Mac OSX**
 
@@ -413,4 +415,3 @@ once per day, on any day that has had a commit to the master branch.
 
 .. image:: docs/phoenix-fire-md.png
    :width: 100%
-
diff --git a/build.py b/build.py
index 7b2c959d..3cd5b828 100755
--- a/build.py
+++ b/build.py
@@ -83,8 +83,8 @@ sipMD5 = {
     'linux64'  : 'b349127a4d46452936e4181d96b12c2d',
 }
 
-wafCurrentVersion = '2.0.7'
-wafMD5 = '48ac1250bcccd0674cf461937875ce9a'
+wafCurrentVersion = '2.0.8'
+wafMD5 = 'bc393f29337cd00aef25d54280ca22e1'
 
 doxygenCurrentVersion = '1.8.8'
 doxygenMD5 = {
diff --git a/wscript b/wscript
index d7227c0b..0c8a2f66 100644
--- a/wscript
+++ b/wscript
@@ -309,14 +309,13 @@ def configure(conf):
             _cleanFlags(conf, key)
 
         # Waf 2 is now calling pythonX.Y-config for fetching libs and flags,
-        # and it may be outputing flags that will cause an explicit link to
+        # and it may be outputting flags that will cause an explicit link to
         # Python's lib, which we don't want as that could tie us to that
-        # speicifc Python instance instead of the one that is loading the
+        # specific Python instance instead of the one that is loading the
         # wxPython extension modules. That's okay for PYEMBED but not for PYEXT
         # configs.  
-        if isDarwin:
-            conf.env.LIBPATH_PYEXT = []
-            conf.env.LIB_PYEXT = []
+        conf.env.LIBPATH_PYEXT = []
+        conf.env.LIB_PYEXT = []
 
 
         # Use the same compilers that wxWidgets used