diff --git a/src/java/org/lwjgl/fmod3/FMOD.java b/src/java/org/lwjgl/fmod3/FMOD.java
index 71e53680..a6c22ecf 100644
--- a/src/java/org/lwjgl/fmod3/FMOD.java
+++ b/src/java/org/lwjgl/fmod3/FMOD.java
@@ -31,13 +31,12 @@
  */
 package org.lwjgl.fmod3;
 
-import java.io.File;
 import java.lang.reflect.Method;
 import java.nio.FloatBuffer;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.StringTokenizer;
 
+import org.lwjgl.LWJGLException;
 import org.lwjgl.LWJGLUtil;
 
 /**
@@ -251,57 +250,18 @@ public class FMOD {
 			return;
 		}
 
-		// create, passing potential locations for native fmod library
-		nCreate(constructFMODSearchPaths());
-		created = true;
-	}
-
-	/**
-	 * Retrieves an array of strings, with potential locations for
-	 * the native fmod library
-	 * @return array of strings, with potential locations for the native fmod library
-	 */
-	private static String[] constructFMODSearchPaths() {
-		// miscellaneous values
-		String libpath = System.getProperty("java.library.path");
-		String seperator = System.getProperty("path.separator");
-
-		// determine os library name
-		String dllName = FMOD_WIN32_LIBRARY_NAME;
-		switch (LWJGLUtil.getPlatform()) {
-			case LWJGLUtil.PLATFORM_MACOSX:
-				dllName = FMOD_OSX_LIBRARY_NAME;
-				break;
-			case LWJGLUtil.PLATFORM_LINUX:
-				dllName = FMOD_LINUX_LIBRARY_NAME;
-				break;
-			default:
-				throw new LinkageError("Unsupported platform");
+		try {
+			String[] fmodPaths = LWJGLUtil.getLibraryPaths(new String[]{
+	                "fmod", "fmod.dll",
+	                "fmod", "libfmod.so",
+	                "fmod", "static-ignored"}, 
+	                	FMOD.class.getClassLoader());
+			LWJGLUtil.log("Found " + fmodPaths.length + " FMOD paths");
+			nCreate(fmodPaths);
+			created = true;
+		} catch (LWJGLException le) {
+			throw new FMODException(le.getMessage());
 		}
-
-		String jwsPath = getPathFromJWS(dllName);
-		LWJGLUtil.log("getPathFromJWS: Paths found: " + jwsPath);
-		if (jwsPath != null) {
-			libpath += seperator
-				+ jwsPath.substring(0, jwsPath.lastIndexOf(File.separator));
-		}
-
-		// split, and rebuild library path to path + dll
-		StringTokenizer st = new StringTokenizer(libpath, seperator);
-		String[] paths = new String[st.countTokens() + 1];
-
-		//build paths
-		for (int i = 0; i < paths.length - 1; i++) {
-			paths[i] = st.nextToken() + File.separator;
-		}
-
-		for(int i=0 ; i<paths.length; i++) {
-			LWJGLUtil.log("Will search " + paths[i] + " for " + dllName);
-		}
-
-		//add cwd path
-		paths[paths.length - 1] = dllName;   
-		return paths;
 	}
 
 	/**
diff --git a/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c b/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c
index 9cd91c82..c0ff4c94 100644
--- a/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c
+++ b/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c
@@ -35,18 +35,6 @@
 
 static const char* VERSION = "0.97";
 
-/**
- * Concatenate two strings
- */
-static char *concatenate(const char *str1, const char *str2) {
-	int length1 = strlen(str1);
-	int length2 = strlen(str2);
-	char *str = (char *)calloc(length1 + length2 + 1, sizeof(char));
-	strncpy(str, str1, length1);
-	strncpy(str + length1, str2, length2 + 1);
-	return str;
-}
-
 /*
  * Class:     org_lwjgl_fmod3_FMOD
  * Method:    getNativeLibraryVersion
@@ -66,23 +54,12 @@ JNIEXPORT void JNICALL Java_org_lwjgl_fmod3_FMOD_nCreate(JNIEnv *env, jclass cla
 	int i;
 	jstring path;
 	char *path_str;
-	char *lib_str;
 	
 	for(i=0;i<pathcount;i++) {
 		path = (jstring) (*env)->GetObjectArrayElement(env, paths, i);
 		path_str = GetStringNativeChars(env, path);
-#ifdef _WIN32
-		lib_str = concatenate(path_str, "fmod.dll");
-#endif
-#ifdef _X11
-		lib_str = concatenate(path_str, "libfmod.so");
-#endif
-#ifdef _MACOSX
-		lib_str = concatenate(path_str, "ignored");
-#endif	
-		printfDebug("Testing '%s'\n", lib_str);
-		fmod_create(env, lib_str);
-		free(lib_str);
+		printfDebug("Testing '%s'\n", path_str);
+		fmod_create(env, path_str);
 		free(path_str);
 
 		if(fmod_instance != NULL) {