diff -upr samba-3.0.10.old/source/configure.in samba-3.0.10/source/configure.in
--- samba-3.0.10.old/source/configure.in	2004-12-15 19:29:48.000000000 +0000
+++ samba-3.0.10/source/configure.in	2006-01-06 14:56:35.000000000 +0000
@@ -4270,10 +4270,15 @@ HAVE_WINBIND=yes
 WINBIND_NSS="nsswitch/libnss_winbind.$SHLIBEXT"
 WINBIND_WINS_NSS="nsswitch/libnss_wins.$SHLIBEXT"
 WINBIND_NSS_LDSHFLAGS=$LDSHFLAGS
+WINBIND_NSS_SONAME_MAJOR=""
 
 case "$host_os" in
 	*linux*)
 		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
+		# We need the versioning on Linux to match what the glibc does
+		WINBIND_NSS="nsswitch/libnss_winbind-$SMB_VERSION_STRING.$SHLIBEXT"
+		WINBIND_WINS_NSS="nsswitch/libnss_wins-$SMB_VERSION_STRING.$SHLIBEXT"
+		WINBIND_NSS_SONAME_MAJOR=".2"
 		;;
 	*freebsd5*)
 		# FreeBSD winbind client is implemented as a wrapper around
@@ -4318,6 +4323,7 @@ AC_SUBST(WINBIND_WINS_NSS)
 AC_SUBST(WINBIND_NSS_LDSHFLAGS)
 AC_SUBST(WINBIND_NSS_EXTRA_OBJS)
 AC_SUBST(WINBIND_NSS_EXTRA_LIBS)
+AC_SUBST(WINBIND_NSS_SONAME_MAJOR)
 
 # Check the setting of --with-winbind
 
diff -upr samba-3.0.10.old/source/Makefile.in samba-3.0.10/source/Makefile.in
--- samba-3.0.10.old/source/Makefile.in	2006-01-06 14:50:30.000000000 +0000
+++ samba-3.0.10/source/Makefile.in	2006-01-06 14:57:01.000000000 +0000
@@ -1075,13 +1075,13 @@ bin/winbindd@EXEEXT@: $(WINBINDD_OBJ) @B
 @WINBIND_NSS@: $(WINBIND_NSS_PICOBJS)
 	@echo "Linking $@"
 	@$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) \
-		@WINBIND_NSS_EXTRA_LIBS@ @SONAMEFLAG@`basename $@`
+		@WINBIND_NSS_EXTRA_LIBS@ @SONAMEFLAG@`basename $@`@WINBIND_NSS_SONAME_MAJOR@
 
 @WINBIND_WINS_NSS@: $(WINBIND_WINS_NSS_PICOBJS)
 	@echo "Linking $@"
 	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_PICOBJS) \
 		$(LDAP_LIBS) $(KRB5LIBS) -lc \
-		@SONAMEFLAG@`basename $@`
+		@SONAMEFLAG@`basename $@`@WINBIND_NSS_SONAME_MAJOR@
 
 nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy
 	@echo "Linking $@"