diff -ur NVIDIA-Linux-x86-1.0-5336-pkg0/Makefile NVIDIA-Linux-x86-1.0-5336-pkg0.new/Makefile
--- NVIDIA-Linux-x86-1.0-5336-pkg0/Makefile	2004-01-14 19:29:12.000000000 -0800
+++ NVIDIA-Linux-x86-1.0-5336-pkg0.new/Makefile	2004-02-12 17:22:46.000000000 -0800
@@ -21,7 +21,11 @@
 
 INSTALL_TLS := $(shell usr/bin/tls_test usr/bin/tls_test_dso.so 2> /dev/null; if [ "$$?" = "0" ]; then echo "1"; else echo "0"; fi)
 
-install: kernel_module_install
+install: kernel_module_install install_files install_links install_finish
+
+install_clean: kernel_module_install rm_old install_files install_links install_finish
+
+rm_old:
 	@echo "Removing all old and conflicting files!"
 	@echo -n "      "
 	rm -f ${ROOT}/usr/lib/libGL.*
@@ -57,6 +61,8 @@
 	rm -f ${ROOT}/usr/X11R6/lib/modules/extensions/libglx.*
 	@echo -n "      "
 	rm -f ${ROOT}/usr/X11R6/lib/modules/extensions/libGLwrapper.*
+
+install_files:
 	@echo "Installing new drivers"
 	@echo -n "      "
 	install usr/lib/libGL.so.${DSOREV} ${ROOT}/usr/lib
@@ -66,29 +72,24 @@
 	install usr/X11R6/lib/modules/drivers/nvidia_drv.o ${ROOT}/usr/X11R6/lib/modules/drivers
 	@echo -n "      "
 	install usr/X11R6/lib/modules/extensions/libglx.so.${DSOREV} ${ROOT}/usr/X11R6/lib/modules/extensions
+
 	@if [ "$(INSTALL_TLS)" = "1" ]; then \
-		mkdir -p ${ROOT}/usr/lib/tls; \
-		echo "      install usr/lib/tls/libGL.so.${DSOREV} ${ROOT}/usr/lib/tls"; \
-		install usr/lib/tls/libGL.so.${DSOREV} ${ROOT}/usr/lib/tls; \
-		echo "      install usr/lib/tls/libGLcore.so.${DSOREV} ${ROOT}/usr/lib/tls"; \
-		install usr/lib/tls/libGLcore.so.${DSOREV} ${ROOT}/usr/lib/tls; \
-		echo "      install usr/X11R6/lib/modules/extensions/tls/libglx.so.${DSOREV} ${ROOT}/usr/X11R6/lib/modules/extensions"; \
-		install usr/X11R6/lib/modules/extensions/tls/libglx.so.${DSOREV} ${ROOT}/usr/X11R6/lib/modules/extensions; \
+	 mkdir -p ${ROOT}/usr/lib/tls; \
+	 echo "      install usr/lib/tls/libGL.so.${DSOREV} ${ROOT}/usr/lib/tls"; \
+	 install usr/lib/tls/libGL.so.${DSOREV} ${ROOT}/usr/lib/tls; \
+	 echo "      install usr/lib/tls/libGLcore.so.${DSOREV} ${ROOT}/usr/lib/tls"; \
+	 install usr/lib/tls/libGLcore.so.${DSOREV} ${ROOT}/usr/lib/tls; \
+	 echo "      install usr/X11R6/lib/modules/extensions/tls/libglx.so.${DSOREV} ${ROOT}/usr/X11R6/lib/modules/extensions"; \
+	 install usr/X11R6/lib/modules/extensions/tls/libglx.so.${DSOREV} ${ROOT}/usr/X11R6/lib/modules/extensions; \
 	fi
+
 	@if [ -f usr/X11R6/lib/libXvMCNVIDIA.a ]; then \
-		echo "      install usr/X11R6/lib/libXvMCNVIDIA.a ${ROOT}/usr/X11R6/lib/libXvMCNVIDIA.a"; \
-		install usr/X11R6/lib/libXvMCNVIDIA.a ${ROOT}/usr/X11R6/lib/libXvMCNVIDIA.a; \
-		echo "      install usr/X11R6/lib/libXvMCNVIDIA.so.${DSOMAJOR}.${DSOMINOR}.${DSOPATCH} ${ROOT}/usr/X11R6/lib/libXvMCNVIDIA.so.${DSOMAJOR}.${DSOMINOR}.${DSOPATCH}"; \
-		install usr/X11R6/lib/libXvMCNVIDIA.so.${DSOMAJOR}.${DSOMINOR}.${DSOPATCH} ${ROOT}/usr/X11R6/lib/libXvMCNVIDIA.so.${DSOMAJOR}.${DSOMINOR}.${DSOPATCH}; \
-	fi
-	@if [ "$(INSTALL_TLS)" = "1" ]; then \
-                echo "      cd ${ROOT}/usr/lib/tls/; ln -fs	libGL.so.${DSOREV} libGL.so"; \
-                cd ${ROOT}/usr/lib/tls/; ln -fs libGL.so.${DSOREV} libGL.so; \
+	 echo "      install usr/X11R6/lib/libXvMCNVIDIA.a ${ROOT}/usr/X11R6/lib/libXvMCNVIDIA.a"; \
+	 install usr/X11R6/lib/libXvMCNVIDIA.a ${ROOT}/usr/X11R6/lib/libXvMCNVIDIA.a; \
+	 echo "      install usr/X11R6/lib/libXvMCNVIDIA.so.${DSOMAJOR}.${DSOMINOR}.${DSOPATCH} ${ROOT}/usr/X11R6/lib/libXvMCNVIDIA.so.${DSOMAJOR}.${DSOMINOR}.${DSOPATCH}"; \
+	 install usr/X11R6/lib/libXvMCNVIDIA.so.${DSOMAJOR}.${DSOMINOR}.${DSOPATCH} ${ROOT}/usr/X11R6/lib/libXvMCNVIDIA.so.${DSOMAJOR}.${DSOMINOR}.${DSOPATCH}; \
 	fi
-	@echo -n "      "
-	cd ${ROOT}/usr/lib/; ln -fs libGL.so.${DSOREV} libGL.so
-	@echo -n "      "
-	cd ${ROOT}/usr/X11R6/lib/modules/extensions; ln -fs libglx.so.${DSOREV} libglx.so
+
 	@echo "Installing documentation in ${DOCDIR}"
 	@echo -n "      "
 	mkdir -p ${DOCDIR}/include
@@ -97,4 +98,43 @@
 	@echo -n "      "
 	cp -r usr/share/doc/* ${DOCDIR}
 	@echo -n "      "
+
+install_links:
+	@echo "Installing symbolic links"
+	lib_dirs='$(ROOT)/usr/lib' ;\
+	 if [ "$(INSTALL_TLS)" = "1" ]; then \
+	  lib_dirs="$$lib_dirs $(ROOT)/usr/lib/tls" ;\
+	 fi ;\
+	 \
+	 for i in $$lib_dirs; do \
+	  cd $$i ;\
+	  links=`find . -type l -maxdepth 1 | grep libGL.so` ;\
+	  for i in $$links; do \
+	   ln -fs libGL.so.$(DSOREV) $$i ;\
+	  done ;\
+	 \
+	  if [ -f libGL.so ]; then \
+	   mv libGL.so libGL.so.old ;\
+	  fi ;\
+	 \
+	  if [ ! -n libGL.so ]; then \
+	   ln -fs libGL.so.$(DSOREV) libGL.so ;\
+	  fi ;\
+	 done ;\
+	
+	cd $(ROOT)/usr/X11R6/lib/modules/extensions ;\
+	 links=`find . -type l -maxdepth 1 | grep libglx.so` ;\
+	 for i in $$links; do \
+	  ln -fs libglx.so.${DSOREV} $$i ;\
+	 done ;\
+	 \
+	 if [ -f libglx.so ]; then \
+	  mv libglx.so libglx.so.old ;\
+	 fi ;\
+	 \
+	 if [ ! -n libglx.so ]; then \
+	  ln -fs libglx.so.$(DSOREV) libglx.so ;\
+	 fi
+
+install_finish:
 	/sbin/ldconfig