diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index 9d4744c80285..a0c6ee6a554d 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 December 1996
 # Whom:			Thomas Gellekum <tg@freebsd.org>
 #
-# $Id: Makefile,v 1.11 1997/08/20 12:12:15 tg Exp $
+# $Id: Makefile,v 1.12 1997/10/01 12:19:40 tg Exp $
 #
 
 DISTNAME=	Tix4.1.0.006
@@ -44,7 +44,7 @@ post-install:
 	    ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 	@${MKDIR} ${PREFIX}/man/man1
 	@mv ${PREFIX}/man/mann/tixwish.1 ${PREFIX}/man/man1
-	@ln -sf ${PREFIX}/bin/tixwish8.0.8.0 ${PREFIX}/bin/tixwish
+	@ln -sf ${PREFIX}/bin/tixwish4.1.8.0 ${PREFIX}/bin/tixwish
 	${LDCONFIG} -m ${PREFIX}/lib
 .for dir in generic unix
 	@${MKDIR} ${PREFIX}/include/tix/${dir}
diff --git a/x11-toolkits/tix/files/patch-aa b/x11-toolkits/tix/files/patch-aa
index fd93f3e55c39..40baef032149 100644
--- a/x11-toolkits/tix/files/patch-aa
+++ b/x11-toolkits/tix/files/patch-aa
@@ -1,5 +1,5 @@
---- configure.orig	Wed Sep 24 01:57:21 1997
-+++ configure	Wed Oct  1 13:31:58 1997
+--- configure.orig	Thu Sep 25 20:32:47 1997
++++ configure	Tue Dec  2 11:39:39 1997
 @@ -1060,6 +1060,7 @@
  
  if test "$val" != ""; then
@@ -34,6 +34,36 @@
  
  #--------------------------------------------------------------------
  #	Find out the top level source directory of the Tix package.
+@@ -1227,25 +1229,25 @@
+ 
+     # The main Tix library
+     #
+-    eval "TIX_LIB_FILE=libtix${TCL_SHARED_LIB_SUFFIX}"
++    eval "TIX_LIB_FILE=libtix`echo ${VERSION} | tr -d .`.so.1.2"
+     TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
+ 
+     # The Tcl SAM library
+     #
+     VERSION=8.0
+-    eval "TCL_SAM_FILE=libtclsam${TCL_SHARED_LIB_SUFFIX}"
++    eval "TCL_SAM_FILE=libtclsam`echo ${VERSION} | tr -d .`.so.1.2"
+     TCL_MAKE_SAM="\${SHLIB_LD} -o ${TCL_SAM_FILE} \${TCL_SAM_OBJS} ${SHLIB_LD_LIBS}"
+     
+     # The Tk SAM library
+     #
+     VERSION=8.0
+-    eval "TK_SAM_FILE=libtksam${TCL_SHARED_LIB_SUFFIX}"
++    eval "TK_SAM_FILE=libtksam`echo ${VERSION} | tr -d .`.so.1.2"
+     TK_MAKE_SAM="\${SHLIB_LD} -o ${TK_SAM_FILE} \${TK_SAM_OBJS} ${SHLIB_LD_LIBS}"
+     
+     # The Tix SAM library
+     #
+     VERSION=${BIN_VERSION}
+-    eval "TIX_SAM_FILE=libtixsam${TCL_SHARED_LIB_SUFFIX}"
++    eval "TIX_SAM_FILE=libtixsam`echo ${VERSION} | tr -d .`.so.1.2"
+     TIX_MAKE_SAM="\${SHLIB_LD} -o ${TIX_SAM_FILE} \${TIX_SAM_OBJS} ${SHLIB_LD_LIBS}"
+ 
+ else
 @@ -1707,15 +1709,15 @@
  s%@SHLIB_VERSION@%$SHLIB_VERSION%g
  s%@DL_LIBS@%$DL_LIBS%g