diff --git a/build3/premake4.lua b/build3/premake4.lua
index 6109f6729..e0aa42acd 100644
--- a/build3/premake4.lua
+++ b/build3/premake4.lua
@@ -339,6 +339,10 @@ end
 		end
 		function initGlew()
 		end
+		function initX11()
+		links {"X11", "dl","pthread"}
+
+		end
 		
 	else
 		dofile ("findOpenGLGlewGlut.lua")
diff --git a/data/multibody.bullet b/data/multibody.bullet
index d621a77ca..17947eed1 100644
Binary files a/data/multibody.bullet and b/data/multibody.bullet differ
diff --git a/examples/OpenGLWindow/SimpleOpenGL2App.cpp b/examples/OpenGLWindow/SimpleOpenGL2App.cpp
index cdaa960d0..b8eadfb43 100644
--- a/examples/OpenGLWindow/SimpleOpenGL2App.cpp
+++ b/examples/OpenGLWindow/SimpleOpenGL2App.cpp
@@ -139,8 +139,10 @@ SimpleOpenGL2App::SimpleOpenGL2App(const char* title, int width, int height)
 #ifndef NO_GLEW
 #ifndef __APPLE__
 #ifndef _WIN32
+#ifndef B3_USE_GLFW
     //some Linux implementations need the 'glewExperimental' to be true
     glewExperimental = GL_TRUE;
+#endif//B3_USE_GLFW
 #endif //_WIN32
     
 #ifndef B3_USE_GLFW
diff --git a/examples/OpenGLWindow/SimpleOpenGL3App.cpp b/examples/OpenGLWindow/SimpleOpenGL3App.cpp
index d5814b92b..bda47d46e 100644
--- a/examples/OpenGLWindow/SimpleOpenGL3App.cpp
+++ b/examples/OpenGLWindow/SimpleOpenGL3App.cpp
@@ -324,8 +324,10 @@ SimpleOpenGL3App::SimpleOpenGL3App(	const char* title, int width,int height, boo
 #ifndef NO_GLEW
 #ifndef __APPLE__
 #ifndef _WIN32
+#ifndef B3_USE_GLFW
     //some Linux implementations need the 'glewExperimental' to be true
     glewExperimental = GL_TRUE;
+#endif //B3_USE_GLFW
 #endif //_WIN32
     
 #ifndef B3_USE_GLFW
diff --git a/examples/OpenGLWindow/X11OpenGLWindow.cpp b/examples/OpenGLWindow/X11OpenGLWindow.cpp
index e85d50d65..51480094f 100644
--- a/examples/OpenGLWindow/X11OpenGLWindow.cpp
+++ b/examples/OpenGLWindow/X11OpenGLWindow.cpp
@@ -1,3 +1,6 @@
+
+#ifndef B3_USE_GLFW
+
 #include "X11OpenGLWindow.h"
 #include "OpenGLInclude.h"
 
@@ -1121,3 +1124,4 @@ int X11OpenGLWindow::fileOpenDialog(char* filename, int maxNameLength)
 	return len;
 
 }
+#endif