diff --git a/autobuild.xml b/autobuild.xml
index 0096381f4..ba425b169 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2101,36 +2101,6 @@
         <key>version</key>
         <string>1.3.2-1.3.5</string>
       </map>
-      <key>open-libndofdev</key>
-      <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2008, Jan Ciger (jan.ciger (at) gmail.com)</string>
-        <key>description</key>
-        <string>Open Source replacement for 3DConnection SDK</string>
-        <key>license</key>
-        <string>BSD</string>
-        <key>license_file</key>
-        <string>LICENSES/libndofdev.txt</string>
-        <key>name</key>
-        <string>open-libndofdev</string>
-        <key>platforms</key>
-        <map>
-          <key>linux</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>b1245d467d5914a266efa16afeb55406</string>
-              <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libndofdev_3p-update-libndofdev/rev/297553/arch/Linux/installer/open_libndofdev-0.3-linux-297553.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>linux</string>
-          </map>
-        </map>
-        <key>version</key>
-        <string>0.3</string>
-      </map>
       <key>openal</key>
       <map>
         <key>copyright</key>
diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake
index b742874e2..7f27a03d9 100644
--- a/indra/cmake/NDOF.cmake
+++ b/indra/cmake/NDOF.cmake
@@ -10,7 +10,7 @@ else (STANDALONE)
   if (WINDOWS OR DARWIN)
     use_prebuilt_binary(libndofdev)
   elseif (LINUX)
-    use_prebuilt_binary(open-libndofdev)
+    use_prebuilt_binary(libndofdev-open)
   endif (WINDOWS OR DARWIN)
 
   if (WINDOWS)
diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake
index 39ab8210d..7f98cbbc4 100644
--- a/indra/cmake/OPENAL.cmake
+++ b/indra/cmake/OPENAL.cmake
@@ -16,16 +16,13 @@ if (OPENAL)
     pkg_check_modules(OPENAL_LIB REQUIRED openal)
     pkg_check_modules(FREEALUT_LIB REQUIRED freealut)
   else (STANDALONE)
-    use_prebuilt_binary(openal-soft)
+    use_prebuilt_binary(openal)
   endif (STANDALONE)
   set(OPENAL_LIBRARIES 
     openal
     alut
     )
-    set(OPENAL_INCLUDE_DIRS
-      ${LIBS_PREBUILT_DIR}/include
-      ${LIBS_PREBUILT_LEGACY_DIR}/include
-      )
+    set(OPENAL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 endif (OPENAL)
 
 if (OPENAL)