diff --git a/src/native/macosx/org_lwjgl_opengl_Display.m b/src/native/macosx/org_lwjgl_opengl_Display.m
index e32998e0..6913c9ee 100644
--- a/src/native/macosx/org_lwjgl_opengl_Display.m
+++ b/src/native/macosx/org_lwjgl_opengl_Display.m
@@ -69,8 +69,10 @@ NSOpenGLContext *createContext(JNIEnv *env, jobject pixel_format, bool double_bu
 	bool stereo = (bool)(*env)->GetBooleanField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "stereo", "Z"));
 
 	attrib_list_t attribs;
+	jboolean allow_software_acceleration = getBooleanProperty(env, "org.lwjgl.opengl.Window.allowSoftwareOpenGL");
 	initAttribList(&attribs);
-	putAttrib(&attribs, NSOpenGLPFAAccelerated);
+	if (!allow_software_acceleration)
+		putAttrib(&attribs, NSOpenGLPFAAccelerated);
 	if (double_buffered)
 		putAttrib(&attribs, NSOpenGLPFADoubleBuffer);
 	putAttrib(&attribs, NSOpenGLPFAColorSize); putAttrib(&attribs, bpp);