diff --git a/make/stub_includes/win32/windows.h b/make/stub_includes/win32/windows.h
index 5abf792d11..ddee94c06d 100644
--- a/make/stub_includes/win32/windows.h
+++ b/make/stub_includes/win32/windows.h
@@ -12,7 +12,7 @@
 typedef int                 BOOL;
 typedef unsigned char       BYTE;
 typedef char                CHAR;
-typedef unsigned int        DWORD;
+typedef unsigned __int32    DWORD;
 typedef int                 INT;
 typedef __int32             INT32;
 typedef __int64             INT64;
@@ -29,12 +29,15 @@ typedef HANDLE              HWND;
 typedef __int32             LONG;
 typedef const char*         LPCSTR;
 typedef void*               LPVOID;
+typedef unsigned __int64    ULONG_PTR;
 typedef struct _proc*       PROC;
 typedef unsigned int*       PUINT;
 typedef unsigned int        UINT;
 typedef unsigned short      USHORT;
 typedef unsigned short      WORD;
 typedef unsigned short      ATOM;
+typedef intptr_t            DWORD_PTR;
+typedef intptr_t*           PDWORD_PTR;
 
 /* Necessary handle typedefs for parsing wglext.h */
 
diff --git a/make/stub_includes/win32/wingdi.h b/make/stub_includes/win32/wingdi.h
index 7862b55335..b169621f5c 100644
--- a/make/stub_includes/win32/wingdi.h
+++ b/make/stub_includes/win32/wingdi.h
@@ -194,6 +194,11 @@ WINUSERAPI int  WINAPI ReleaseDC(HWND hWnd, HDC hDC);
 WINUSERAPI BOOL WINAPI DestroyWindow(HWND hWnd);
 WINUSERAPI DWORD WINAPI GetObjectType(HGDIOBJ h);
 
+WINUSERAPI HANDLE WINAPI GetCurrentProcess(void);
+WINUSERAPI BOOL WINAPI GetProcessAffinityMask(HANDLE hProcess,PDWORD_PTR lpProcessAffinityMask,PDWORD_PTR lpSystemAffinityMask);
+WINUSERAPI BOOL WINAPI SetProcessAffinityMask(HANDLE hProcess,DWORD_PTR dwProcessAffinityMask);
+
+
 // Routines for changing gamma ramp of display device
 WINGDIAPI BOOL        WINAPI GetDeviceGammaRamp(HDC,LPVOID);
 WINGDIAPI BOOL        WINAPI SetDeviceGammaRamp(HDC,LPVOID);
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
index cd39ddc151..ac71d6e9c0 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
@@ -60,6 +60,7 @@
 import javax.media.opengl.GLProfile;
 
 import com.jogamp.common.JogampRuntimeException;
+import com.jogamp.common.nio.PointerBuffer;
 import com.jogamp.common.util.ReflectionUtil;
 import com.jogamp.nativewindow.impl.ProxySurface;
 import com.jogamp.nativewindow.impl.windows.GDI;
@@ -125,6 +126,42 @@ public WindowsWGLDrawableFactory() {
   Thread sharedResourceThread;
   HashMap/*<connection, SharedResource>*/ sharedMap = new HashMap();
 
+  long processAffinityChanges = 0;
+  PointerBuffer procMask = PointerBuffer.allocateDirect(1);
+  PointerBuffer sysMask = PointerBuffer.allocateDirect(1);
+
+  protected void enterThreadCriticalZone() {
+    synchronized (sysMask) {
+        if( 0 == processAffinityChanges) {
+            long pid = GDI.GetCurrentProcess();
+            if ( GDI.GetProcessAffinityMask(pid, procMask, sysMask) ) {
+                if(DEBUG) {
+                    System.err.println("WindowsWGLDrawableFactory.enterThreadCriticalZone() - 0x" + Long.toHexString(pid) + " - " + Thread.currentThread().getName());
+                    Thread.dumpStack();
+                }
+                processAffinityChanges = pid;
+                GDI.SetProcessAffinityMask(pid, 1);
+            }
+        }
+    }
+  }
+
+  protected void leaveThreadCriticalZone() {
+    synchronized (sysMask) {
+        if( 0 != processAffinityChanges) {
+            long pid = GDI.GetCurrentProcess();
+            if( pid != processAffinityChanges) {
+                throw new GLException("PID doesn't match: set PID 0x" + Long.toHexString(processAffinityChanges) +
+                                                       " this PID 0x" + Long.toHexString(pid) );
+            }
+            if(DEBUG) {
+                System.err.println("WindowsWGLDrawableFactory.leaveThreadCriticalZone() - 0x" + Long.toHexString(pid) + " - " + Thread.currentThread().getName());
+            }
+            GDI.SetProcessAffinityMask(pid, sysMask.get(0));
+        }
+    }
+  }
+
   static class SharedResource implements SharedResourceRunner.Resource {
       private WindowsGraphicsDevice device;
       private AbstractGraphicsScreen screen;
diff --git a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
index 78ca24be02..fe591c9fcf 100644
--- a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
+++ b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
@@ -220,6 +220,9 @@ protected GLDrawableFactory() {
     }
   }
 
+  protected void enterThreadCriticalZone() {};
+  protected void leaveThreadCriticalZone() {};
+
   protected abstract void shutdownInstance();
 
   /**
diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java
index 378d3df9c4..3e1727f509 100644
--- a/src/jogl/classes/javax/media/opengl/GLProfile.java
+++ b/src/jogl/classes/javax/media/opengl/GLProfile.java
@@ -1218,6 +1218,15 @@ private static synchronized boolean initProfilesForDevice(AbstractGraphicsDevice
         if(null == device) {
             return false;
         }
+        GLDrawableFactory factory = GLDrawableFactory.getFactoryImpl(device);
+        factory.enterThreadCriticalZone();
+        try {
+            return initProfilesForDeviceImpl(device);
+        } finally {
+            factory.leaveThreadCriticalZone();
+        }
+    }
+    private static synchronized boolean initProfilesForDeviceImpl(AbstractGraphicsDevice device) {
         boolean isSet = GLContext.getAvailableGLVersionsSet(device);
 
         if(DEBUG) {