diff --git a/src/java/org/lwjgl/openal/ALC.java b/src/java/org/lwjgl/openal/ALC.java
index 02c0334c..10510651 100644
--- a/src/java/org/lwjgl/openal/ALC.java
+++ b/src/java/org/lwjgl/openal/ALC.java
@@ -167,7 +167,7 @@ public final class ALC {
 		return nalcGetString(AL.device.device, pname);
 	}
 
-	native static String nalcGetString(int device, int pname);
+	native static String nalcGetString(long device, int pname);
 
 	/**
 	 * The application can query ALC for information using an integer query function.
@@ -194,7 +194,7 @@ public final class ALC {
 		nalcGetIntegerv(AL.device.device, pname, integerdata.remaining(), integerdata, integerdata.position());
 	}
 
-	native static void nalcGetIntegerv(int device, int pname, int size, Buffer integerdata, int offset);
+	native static void nalcGetIntegerv(long device, int pname, int size, Buffer integerdata, int offset);
 
 	/**
 	 * The <code>alcOpenDevice</code> function allows the application (i.e. the client program) to
@@ -219,7 +219,7 @@ public final class ALC {
 	 *
 	 * @param device address of native device to close
 	 */
-	native static void alcCloseDevice(int device);
+	native static void alcCloseDevice(long device);
 
 	/**
 	 * A context is created using <code>alcCreateContext</code>. The device parameter has to be a valid
@@ -236,7 +236,7 @@ public final class ALC {
 	 * @param attrList Buffer to read attributes from
 	 * @return New context, or null if creation failed
 	 */
-	native static ALCcontext alcCreateContext(int device, IntBuffer attrList);
+	native static ALCcontext alcCreateContext(long device, IntBuffer attrList);
 
 	/**
 	 * To make a Context current with respect to AL Operation (state changes by issueing
@@ -252,7 +252,7 @@ public final class ALC {
 	 * @param context address of context to make current
 	 * @return true if successfull, false if not
 	 */
-	native static int alcMakeContextCurrent(int context);
+	native static int alcMakeContextCurrent(long context);
 
 	/**
 	 * The current context is the only context accessible to state changes by AL commands
@@ -269,7 +269,7 @@ public final class ALC {
 		nalcProcessContext(AL.context.context);
 	}
 
-	native static void nalcProcessContext(int context);
+	native static void nalcProcessContext(long context);
 
 	/**
 	 * The application can query for, and obtain an handle to, the current context for the
@@ -285,7 +285,7 @@ public final class ALC {
 	 * @param context address of context to get device for
 	 * @param ALCdevice associated with context
 	 */
-	native static ALCdevice alcGetContextsDevice(int context);
+	native static ALCdevice alcGetContextsDevice(long context);
 
 	/**
 	 * The application can suspend any context from processing (including the current
@@ -302,7 +302,7 @@ public final class ALC {
   public static void alcSuspendContext() {
   	nalcSuspendContext(AL.context.context);
   }
-	native static void nalcSuspendContext(int context);
+	native static void nalcSuspendContext(long context);
 
 	/**
 	 * The correct way to destroy a context is to first release it using <code>alcMakeCurrent</code> and
@@ -310,7 +310,7 @@ public final class ALC {
 	 *
 	 * @param context address of context to Destroy
 	 */
-	native static void alcDestroyContext(int context);
+	native static void alcDestroyContext(long context);
 
 	/**
 	 * ALC uses the same conventions and mechanisms as AL for error handling. In
@@ -331,7 +331,7 @@ public final class ALC {
 		return nalcGetError(AL.device.device);
 	}
 
-	native static int nalcGetError(int device);
+	native static int nalcGetError(long device);
 
 	/**
 	* Verify that a given extension is available for the current context and the device it
@@ -346,7 +346,7 @@ public final class ALC {
 		return nalcIsExtensionPresent(AL.device.device, extName);
 	}
 
-	native static boolean nalcIsExtensionPresent(int device, String extName);
+	native static boolean nalcIsExtensionPresent(long device, String extName);
 
 	/**
 	 * Enumeration/token values are device independend, but tokens defined for
@@ -362,5 +362,5 @@ public final class ALC {
 		return nalcGetEnumValue(AL.device.device, enumName);
 	}
 
-	native static int nalcGetEnumValue(int device, String enumName);
+	native static int nalcGetEnumValue(long device, String enumName);
 }
diff --git a/src/java/org/lwjgl/openal/ALCcontext.java b/src/java/org/lwjgl/openal/ALCcontext.java
index a3f594f7..8ef2647d 100644
--- a/src/java/org/lwjgl/openal/ALCcontext.java
+++ b/src/java/org/lwjgl/openal/ALCcontext.java
@@ -46,14 +46,14 @@ import org.lwjgl.BufferUtils;
 final class ALCcontext {
 
 	/** address of actual context */
-	final int context;
+	final long context;
 
 	/** 
 	 * Creates a new instance of ALCcontext 
 	 * 
 	 * @param context address of actual context
 	 */
-	ALCcontext(int context) {
+	ALCcontext(long context) {
 		this.context = context;
 	}
 
diff --git a/src/java/org/lwjgl/openal/ALCdevice.java b/src/java/org/lwjgl/openal/ALCdevice.java
index 2b566b6c..f49f9ce1 100644
--- a/src/java/org/lwjgl/openal/ALCdevice.java
+++ b/src/java/org/lwjgl/openal/ALCdevice.java
@@ -42,14 +42,14 @@ package org.lwjgl.openal;
 final class ALCdevice {
     
     /** address of actual device */
-    final int device;
+    final long device;
     
     /** 
      * Creates a new instance of ALCdevice 
      *
      * @param device address of actual device
      */
-    ALCdevice(int device) {
+    ALCdevice(long device) {
         this.device = device;
     }   
-}
\ No newline at end of file
+}
diff --git a/src/native/common/org_lwjgl_openal_ALC.c b/src/native/common/org_lwjgl_openal_ALC.c
index 70b107b1..215dc8eb 100644
--- a/src/native/common/org_lwjgl_openal_ALC.c
+++ b/src/native/common/org_lwjgl_openal_ALC.c
@@ -81,7 +81,7 @@ static alcGetEnumValuePROC alcGetEnumValue;
  * C Specification:
  * ALubyte * alcGetString(ALCdevice *device, ALenum token);
  */
-static jstring JNICALL Java_org_lwjgl_openal_ALC_nalcGetString (JNIEnv *env, jclass clazz, jint deviceaddress, jint token) {
+static jstring JNICALL Java_org_lwjgl_openal_ALC_nalcGetString (JNIEnv *env, jclass clazz, jlong deviceaddress, jint token) {
 	const char* alcString = (const char*) alcGetString((ALCdevice*) deviceaddress, (ALenum) token);
 	jstring string;
 
@@ -101,7 +101,7 @@ static jstring JNICALL Java_org_lwjgl_openal_ALC_nalcGetString (JNIEnv *env, jcl
  * C Specification:
  * ALvoid alcGetIntegerv(ALCdevice *device, ALenum token, ALsizei size, ALint *dest);
  */
-static void JNICALL Java_org_lwjgl_openal_ALC_nalcGetIntegerv (JNIEnv *env, jclass clazz, jint deviceaddress, jint token, jint size, jobject dest, jint offset) {
+static void JNICALL Java_org_lwjgl_openal_ALC_nalcGetIntegerv (JNIEnv *env, jclass clazz, jlong deviceaddress, jint token, jint size, jobject dest, jint offset) {
   ALint* address = NULL;
   if (dest != NULL) {
     address = offset + (ALint*) (*env)->GetDirectBufferAddress(env, dest);
@@ -143,10 +143,10 @@ static jobject JNICALL Java_org_lwjgl_openal_ALC_alcOpenDevice (JNIEnv *env, jcl
 
 	/* find class and constructor */
 	alcDevice_class		= (*env)->FindClass(env, "org/lwjgl/openal/ALCdevice");
-	alcDevice_method	= (*env)->GetMethodID(env, alcDevice_class, "<init>", "(I)V");
+	alcDevice_method	= (*env)->GetMethodID(env, alcDevice_class, "<init>", "(J)V");
 
 	/* create instance */
-	alcDevice_object = (*env)->NewObject(env, alcDevice_class, alcDevice_method, (int) device);
+	alcDevice_object = (*env)->NewObject(env, alcDevice_class, alcDevice_method, (jlong) device);
 
 	/* clean up */
 	if (tokenstring != NULL)
@@ -161,7 +161,7 @@ static jobject JNICALL Java_org_lwjgl_openal_ALC_alcOpenDevice (JNIEnv *env, jcl
  * C Specification:
  * void alcCloseDevice( ALCdevice *dev );
  */
-static void JNICALL Java_org_lwjgl_openal_ALC_alcCloseDevice (JNIEnv *env, jclass clazz, jint deviceaddress) {
+static void JNICALL Java_org_lwjgl_openal_ALC_alcCloseDevice (JNIEnv *env, jclass clazz, jlong deviceaddress) {
 	alcCloseDevice((ALCdevice*) deviceaddress);
 }
 
@@ -171,7 +171,7 @@ static void JNICALL Java_org_lwjgl_openal_ALC_alcCloseDevice (JNIEnv *env, jclas
  * C Specification:
  * ALCcontext* alcCreateContext( ALCdevice *dev, ALint* attrlist );
  */
-static jobject JNICALL Java_org_lwjgl_openal_ALC_alcCreateContext (JNIEnv *env, jclass clazz, jint deviceaddress, jobject attrlist) {
+static jobject JNICALL Java_org_lwjgl_openal_ALC_alcCreateContext (JNIEnv *env, jclass clazz, jlong deviceaddress, jobject attrlist) {
 	ALint* address = NULL;
 	ALCcontext* context;
 	/* get ready to create ALCcontext instance */
@@ -191,10 +191,10 @@ static jobject JNICALL Java_org_lwjgl_openal_ALC_alcCreateContext (JNIEnv *env,
 
 	/* find class and constructor */
 	alcContext_class	= (*env)->FindClass(env, "org/lwjgl/openal/ALCcontext");
-	alcContext_method	= (*env)->GetMethodID(env, alcContext_class, "<init>", "(I)V");
+	alcContext_method	= (*env)->GetMethodID(env, alcContext_class, "<init>", "(J)V");
 
 	/* create instance */
-	alcContext_object = (*env)->NewObject(env, alcContext_class, alcContext_method, (int) context);
+	alcContext_object = (*env)->NewObject(env, alcContext_class, alcContext_method, (jlong)context);
 
 	CHECK_ALC_ERROR
 	return alcContext_object;
@@ -206,7 +206,7 @@ static jobject JNICALL Java_org_lwjgl_openal_ALC_alcCreateContext (JNIEnv *env,
  * C Specification:
  * ALCboolean alcMakeContextCurrent(ALCcontext *context);
  */
-static jint JNICALL Java_org_lwjgl_openal_ALC_alcMakeContextCurrent (JNIEnv *env, jclass clazz, jint contextaddress) {
+static jint JNICALL Java_org_lwjgl_openal_ALC_alcMakeContextCurrent (JNIEnv *env, jclass clazz, jlong contextaddress) {
 	ALCcontext* context = (ALCcontext*) contextaddress;
 	ALCenum result;
 	if(context == NULL) {
@@ -223,7 +223,7 @@ static jint JNICALL Java_org_lwjgl_openal_ALC_alcMakeContextCurrent (JNIEnv *env
  * C Specification:
  * void alcProcessContext(ALCcontext *context);
  */
-static void JNICALL Java_org_lwjgl_openal_ALC_nalcProcessContext (JNIEnv *env, jclass clazz, jint contextaddress) {
+static void JNICALL Java_org_lwjgl_openal_ALC_nalcProcessContext (JNIEnv *env, jclass clazz, jlong contextaddress) {
 	alcProcessContext((ALCcontext*) contextaddress);
 }
 
@@ -246,10 +246,10 @@ static jobject JNICALL Java_org_lwjgl_openal_ALC_alcGetCurrentContext (JNIEnv *e
 	}
 	/* find class and constructor */
 	alcContext_class	= (*env)->FindClass(env, "org/lwjgl/openal/ALCcontext");
-	alcContext_method	= (*env)->GetMethodID(env, alcContext_class, "<init>", "(I)V");
+	alcContext_method	= (*env)->GetMethodID(env, alcContext_class, "<init>", "(J)V");
 
 	/* create instance */
-	alcContext_object = (*env)->NewObject(env, alcContext_class, alcContext_method, (int) context);
+	alcContext_object = (*env)->NewObject(env, alcContext_class, alcContext_method, (jlong) context);
 
 	return alcContext_object;
 }
@@ -260,7 +260,7 @@ static jobject JNICALL Java_org_lwjgl_openal_ALC_alcGetCurrentContext (JNIEnv *e
  * C Specification:
  * ALCdevice* alcGetContextsDevice(ALCcontext *context);
  */
-static jobject JNICALL Java_org_lwjgl_openal_ALC_alcGetContextsDevice (JNIEnv *env, jclass clazz, jint contextaddress) {
+static jobject JNICALL Java_org_lwjgl_openal_ALC_alcGetContextsDevice (JNIEnv *env, jclass clazz, jlong contextaddress) {
 
 	ALCdevice* device = alcGetContextsDevice((ALCcontext*) contextaddress); 
 	/* get ready to create ALCdevice instance */
@@ -274,10 +274,10 @@ static jobject JNICALL Java_org_lwjgl_openal_ALC_alcGetContextsDevice (JNIEnv *e
 
 	/* find class and constructor */
 	alcDevice_class		= (*env)->FindClass(env, "org/lwjgl/openal/ALCdevice");
-	alcDevice_method	= (*env)->GetMethodID(env, alcDevice_class, "<init>", "(I)V");
+	alcDevice_method	= (*env)->GetMethodID(env, alcDevice_class, "<init>", "(J)V");
 
 	/* create instance */
-	alcDevice_object = (*env)->NewObject(env, alcDevice_class, alcDevice_method, (int) device);
+	alcDevice_object = (*env)->NewObject(env, alcDevice_class, alcDevice_method, (jlong) device);
 
 	return alcDevice_object;
 }
@@ -288,7 +288,7 @@ static jobject JNICALL Java_org_lwjgl_openal_ALC_alcGetContextsDevice (JNIEnv *e
  * C Specification:
  * void alcSuspendContext(ALCcontext *context);
  */
-static void JNICALL Java_org_lwjgl_openal_ALC_nalcSuspendContext (JNIEnv *env, jclass clazz, jint contextaddress) {
+static void JNICALL Java_org_lwjgl_openal_ALC_nalcSuspendContext (JNIEnv *env, jclass clazz, jlong contextaddress) {
 	alcSuspendContext((ALCcontext*) contextaddress);
 }
 
@@ -298,7 +298,7 @@ static void JNICALL Java_org_lwjgl_openal_ALC_nalcSuspendContext (JNIEnv *env, j
  * C Specification:
  * void alcDestroyContext(ALCcontext *context);
  */
-static void JNICALL Java_org_lwjgl_openal_ALC_alcDestroyContext (JNIEnv *env, jclass clazz, jint contextaddress) {
+static void JNICALL Java_org_lwjgl_openal_ALC_alcDestroyContext (JNIEnv *env, jclass clazz, jlong contextaddress) {
 	alcDestroyContext((ALCcontext*) contextaddress);
 }
 
@@ -308,7 +308,7 @@ static void JNICALL Java_org_lwjgl_openal_ALC_alcDestroyContext (JNIEnv *env, jc
  * C Specification:
  * ALCenum alcGetError(ALCdevice *device);
  */
-static jint JNICALL Java_org_lwjgl_openal_ALC_nalcGetError (JNIEnv *env, jclass clazz, jint deviceaddress) {
+static jint JNICALL Java_org_lwjgl_openal_ALC_nalcGetError (JNIEnv *env, jclass clazz, jlong deviceaddress) {
 	jint result = alcGetError((ALCdevice*) deviceaddress);
 	CHECK_ALC_ERROR
 	return result;
@@ -320,7 +320,7 @@ static jint JNICALL Java_org_lwjgl_openal_ALC_nalcGetError (JNIEnv *env, jclass
  * C Specification:
  * ALboolean alcIsExtensionPresent(ALCdevice *device, ALubyte *extName);
  */
-static jboolean JNICALL Java_org_lwjgl_openal_ALC_nalcIsExtensionPresent (JNIEnv *env, jclass clazz, jint deviceaddress, jstring extName) {
+static jboolean JNICALL Java_org_lwjgl_openal_ALC_nalcIsExtensionPresent (JNIEnv *env, jclass clazz, jlong deviceaddress, jstring extName) {
 	/* get extension */
 	ALubyte* functionname = (ALubyte*) GetStringNativeChars(env, extName);
 	
@@ -338,7 +338,7 @@ static jboolean JNICALL Java_org_lwjgl_openal_ALC_nalcIsExtensionPresent (JNIEnv
  * C Specification:
  * ALenum alcGetEnumValue(ALCdevice *device, ALubyte *enumName);
  */
-static jint JNICALL Java_org_lwjgl_openal_ALC_nalcGetEnumValue (JNIEnv *env, jclass clazz, jint deviceaddress, jstring enumName) {	
+static jint JNICALL Java_org_lwjgl_openal_ALC_nalcGetEnumValue (JNIEnv *env, jclass clazz, jlong deviceaddress, jstring enumName) {	
 	/* get extension */
 	ALubyte* enumerationname = (ALubyte*) GetStringNativeChars(env, enumName);
 	
@@ -360,20 +360,20 @@ extern "C" {
 #endif
 JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_initNativeStubs(JNIEnv *env, jclass clazz) {
 	JavaMethodAndExtFunction functions[] = {
-		{"nalcGetString", "(II)Ljava/lang/String;", (void*)&Java_org_lwjgl_openal_ALC_nalcGetString, "alcGetString", (void*)&alcGetString},
-		{"nalcGetIntegerv", "(IIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_openal_ALC_nalcGetIntegerv, "alcGetIntegerv", (void*)&alcGetIntegerv},
+		{"nalcGetString", "(JI)Ljava/lang/String;", (void*)&Java_org_lwjgl_openal_ALC_nalcGetString, "alcGetString", (void*)&alcGetString},
+		{"nalcGetIntegerv", "(JIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_openal_ALC_nalcGetIntegerv, "alcGetIntegerv", (void*)&alcGetIntegerv},
 		{"alcOpenDevice", "(Ljava/lang/String;)Lorg/lwjgl/openal/ALCdevice;", (void*)&Java_org_lwjgl_openal_ALC_alcOpenDevice, "alcOpenDevice", (void*)&alcOpenDevice},
-		{"alcCloseDevice", "(I)V", (void*)&Java_org_lwjgl_openal_ALC_alcCloseDevice, "alcCloseDevice", (void*)&alcCloseDevice},
-		{"alcCreateContext", "(ILjava/nio/IntBuffer;)Lorg/lwjgl/openal/ALCcontext;", (void*)&Java_org_lwjgl_openal_ALC_alcCreateContext, "alcCreateContext", (void*)&alcCreateContext},
-		{"alcMakeContextCurrent", "(I)I", (void*)&Java_org_lwjgl_openal_ALC_alcMakeContextCurrent, "alcMakeContextCurrent", (void*)&alcMakeContextCurrent},
-		{"nalcProcessContext", "(I)V", (void*)&Java_org_lwjgl_openal_ALC_nalcProcessContext, "alcProcessContext", (void*)&alcProcessContext},
+		{"alcCloseDevice", "(J)V", (void*)&Java_org_lwjgl_openal_ALC_alcCloseDevice, "alcCloseDevice", (void*)&alcCloseDevice},
+		{"alcCreateContext", "(JLjava/nio/IntBuffer;)Lorg/lwjgl/openal/ALCcontext;", (void*)&Java_org_lwjgl_openal_ALC_alcCreateContext, "alcCreateContext", (void*)&alcCreateContext},
+		{"alcMakeContextCurrent", "(J)I", (void*)&Java_org_lwjgl_openal_ALC_alcMakeContextCurrent, "alcMakeContextCurrent", (void*)&alcMakeContextCurrent},
+		{"nalcProcessContext", "(J)V", (void*)&Java_org_lwjgl_openal_ALC_nalcProcessContext, "alcProcessContext", (void*)&alcProcessContext},
 		{"alcGetCurrentContext", "()Lorg/lwjgl/openal/ALCcontext;", (void*)&Java_org_lwjgl_openal_ALC_alcGetCurrentContext, "alcGetCurrentContext", (void*)&alcGetCurrentContext},
-		{"alcGetContextsDevice", "(I)Lorg/lwjgl/openal/ALCdevice;", (void*)&Java_org_lwjgl_openal_ALC_alcGetContextsDevice, "alcGetContextsDevice", (void*)&alcGetContextsDevice},
-		{"nalcSuspendContext", "(I)V", (void*)&Java_org_lwjgl_openal_ALC_nalcSuspendContext, "alcSuspendContext", (void*)&alcSuspendContext},
-		{"alcDestroyContext", "(I)V", (void*)&Java_org_lwjgl_openal_ALC_alcDestroyContext, "alcDestroyContext", (void*)&alcDestroyContext},
-		{"nalcGetError", "(I)I", (void*)&Java_org_lwjgl_openal_ALC_nalcGetError, "alcGetError", (void*)&alcGetError},
-		{"nalcIsExtensionPresent", "(ILjava/lang/String;)Z", (void*)&Java_org_lwjgl_openal_ALC_nalcIsExtensionPresent, "alcIsExtensionPresent", (void*)&alcIsExtensionPresent},
-		{"nalcGetEnumValue", "(ILjava/lang/String;)I", (void*)&Java_org_lwjgl_openal_ALC_nalcGetEnumValue, "alcGetEnumValue", (void*)&alcGetEnumValue}
+		{"alcGetContextsDevice", "(J)Lorg/lwjgl/openal/ALCdevice;", (void*)&Java_org_lwjgl_openal_ALC_alcGetContextsDevice, "alcGetContextsDevice", (void*)&alcGetContextsDevice},
+		{"nalcSuspendContext", "(J)V", (void*)&Java_org_lwjgl_openal_ALC_nalcSuspendContext, "alcSuspendContext", (void*)&alcSuspendContext},
+		{"alcDestroyContext", "(J)V", (void*)&Java_org_lwjgl_openal_ALC_alcDestroyContext, "alcDestroyContext", (void*)&alcDestroyContext},
+		{"nalcGetError", "(J)I", (void*)&Java_org_lwjgl_openal_ALC_nalcGetError, "alcGetError", (void*)&alcGetError},
+		{"nalcIsExtensionPresent", "(JLjava/lang/String;)Z", (void*)&Java_org_lwjgl_openal_ALC_nalcIsExtensionPresent, "alcIsExtensionPresent", (void*)&alcIsExtensionPresent},
+		{"nalcGetEnumValue", "(JLjava/lang/String;)I", (void*)&Java_org_lwjgl_openal_ALC_nalcGetEnumValue, "alcGetEnumValue", (void*)&alcGetEnumValue}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
 	extal_InitializeClass(env, clazz, num_functions, functions);