diff --git a/indra/cmake/OpenGL.cmake b/indra/cmake/OpenGL.cmake
index 3dcd396c5..f8a113f65 100644
--- a/indra/cmake/OpenGL.cmake
+++ b/indra/cmake/OpenGL.cmake
@@ -2,9 +2,9 @@
 include(Prebuilt)
 
 if (NOT STANDALONE)
-  use_prebuilt_binary(GL)
+  use_prebuilt_binary(glext)
   # possible glh_linear should have its own .cmake file instead
   #use_prebuilt_binary(glh_linear)
   # actually... not any longer, it's now in git -SG
-  set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
 endif (NOT STANDALONE)
diff --git a/install.xml b/install.xml
index c303a324d..341dcc55c 100644
--- a/install.xml
+++ b/install.xml
@@ -3,43 +3,48 @@
 <map>
     <key>installables</key>
     <map>
-      <key>GL</key>
+      <key>glext</key>
       <map>
         <key>copyright</key>
-        <string>Copyright (c) 1991-2000 Silicon Graphics, Inc.</string>
+        <string>Copyright (c) 2007-2010 Khronos Group Inc.</string>
         <key>description</key>
-        <string>A standard for 3D Graphics rendering engine.</string>
+        <string>OpenGL Extension Header Files</string>
         <key>license</key>
-        <string>GL</string>
+        <string>glext</string>
         <key>packages</key>
         <map>
-          <key>darwin</key>
-          <map>
-            <key>md5sum</key>
-            <string>0bd2795a2afe09f6c563f2f888f24cc9</string>
-            <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-darwin-20080613.tar.bz2</uri>
-          </map>
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>2ab29212a7f3acdaebf10059af816be0</string>
+            <string>8b743e6e9ea9f3070e6becf07b50f090</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-linux-20080812.tar.bz2</uri>
-          </map>
-          <key>linux64</key>
-          <map>
-            <key>md5sum</key>
-            <string>9c3dff3817f1105f9054401fdef1fe50</string>
-            <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-linux64-20080909.tar.bz2</uri>
+            <uri>https://github.com/downloads/Shyotl/SingularityViewer/glext-68-win32-linux.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>91155239b02f576384603795d41eb971</string>
+            <string>8b743e6e9ea9f3070e6becf07b50f090</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-windows-20090505.tar.bz2</uri>
+            <uri>https://github.com/downloads/Shyotl/SingularityViewer/glext-68-win32-linux.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+	  <key>freeglut</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (c) 1999-2000 Pawel W. Olszta.</string>
+        <key>description</key>
+        <string>OpenSource alternative to OpenGL Utility Toolkit</string>
+        <key>license</key>
+        <string>freeglut</string>
+        <key>packages</key>
+        <map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>fefd6b548d677a60a198e50d9326d939</string>
+            <key>url</key>
+            <uri>https://github.com/downloads/Shyotl/SingularityViewer/freeglut-2.6.0-win32.tar.bz2</uri>
           </map>
         </map>
       </map>
@@ -1330,10 +1335,61 @@ anguage Infrstructure (CLI) international standard</string>
         <key>url</key>
         <string>http://opensource-definition.org/licenses/afl-2.1.html</string>
       </map>
-      <key>GL</key>
+      <key>glext</key>
       <map>
-        <key>url</key>
-        <string>http://www.xfree86.org/4.4.0/LICENSE9.html#sgi</string>
+        <key>text</key>
+        <string>Copyright (c) 2007-2010 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and/or associated documentation files (the
+"Materials"), to deal in the Materials without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Materials, and to
+permit persons to whom the Materials are furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Materials.
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+        </string>
+      </map>
+      <key>freeglut</key>
+      <map>
+        <key>text</key>
+        <string>Freeglut Copyright
+------------------
+
+Freeglut code without an explicit copyright is covered by the following
+copyright:
+
+Copyright (c) 1999-2000 Pawel W. Olszta. All Rights Reserved.
+Permission is hereby granted, free of charge,  to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction,  including without limitation the rights
+to use, copy,  modify, merge,  publish, distribute,  sublicense,  and/or sell
+copies or substantial portions of the Software.
+
+The above  copyright notice  and this permission notice  shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE  IS PROVIDED "AS IS",  WITHOUT WARRANTY OF ANY KIND,  EXPRESS OR
+IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO THE WARRANTIES  OF MERCHANTABILITY,
+FITNESS  FOR  A PARTICULAR PURPOSE  AND NONINFRINGEMENT.  IN  NO EVENT  SHALL
+PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM,  DAMAGES OR OTHER LIABILITY, WHETHER
+IN  AN ACTION  OF CONTRACT,  TORT OR OTHERWISE,  ARISING FROM,  OUT OF  OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice,  the name of Pawel W. Olszta shall not be
+used  in advertising  or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from Pawel W. Olszta.
+        </string>
       </map>
       <key>MSDTW</key>
       <map>