diff --git a/vfs/samba/Makefile.in b/vfs/samba/Makefile.in
index 3b24ad504..3577d6e02 100644
--- a/vfs/samba/Makefile.in
+++ b/vfs/samba/Makefile.in
@@ -38,27 +38,15 @@ INSTALLPERMS = 0755
 CONFIGFILE = @configdir@/smb.conf
 LMHOSTSFILE = @configdir@/lmhosts
 DRIVERFILE = $(LIBDIR)/printers.def
-PASSWD_PROGRAM = /bin/passwd
-# This is where smbpasswd et al go
-PRIVATEDIR = @privatedir@
-
-SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd
 
 # The directory where code page definition files go
 CODEPAGEDIR = @codepagedir@
 
-# The current codepage definition list.
-CODEPAGELIST= 437 737 850 852 861 932 866 949 950 936
-
-PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\"
 FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include $(CPPFLAGS)
 FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"
 FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
 FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\"
-FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H
-FLAGS  = $(ISA) $(FLAGS5) $(PASSWD_FLAGS)
-
-SCRIPTS = $(srcdir)/script/smbtar $(srcdir)/script/addtosmbpass $(srcdir)/script/convert_smbpasswd
+FLAGS = $(ISA) $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H
 
 ######################################################################
 # object file lists
@@ -142,14 +130,6 @@ distclean: clean
 	rm -f include/config.h include/stamp-h Makefile
 	rm -f config.status config.cache so_locations
 
-#
-# This target is for documenation updators. It regenerates
-# the man pages and HTML docs from the YODL source files.
-# In order for this target to work YODL must be installed
-# and working on your system. JRA.
-yodldocs:
-	@$(SHELL) $(srcdir)/script/makeyodldocs.sh $(srcdir)
-
 # this target is really just for my use. It only works on a limited
 # range of machines and is used to produce a list of potentially
 # dead (ie. unused) functions in the code. (tridge)
diff --git a/vfs/samba/configure.in b/vfs/samba/configure.in
index 615998613..0882b89a1 100644
--- a/vfs/samba/configure.in
+++ b/vfs/samba/configure.in
@@ -560,27 +560,6 @@ AC_ARG_WITH(ssl,
 )
 
 
-#################################################
-# set private directory location
-AC_ARG_WITH(privatedir,
-[  --with-privatedir=DIR     Where to put smbpasswd ($ac_default_prefix/private)],
-[ case "$withval" in
-  yes|no)
-  #
-  # Just in case anybody calls it without argument
-  #
-    AC_MSG_WARN([--with-privatedir called without argument - will use default])
-    privatedir='${prefix}/private'
-  ;;
-  * )
-    privatedir="$withval"
-    ;;
-  esac
-  AC_SUBST(privatedir)],
-  [privatedir='${prefix}/private'
-   AC_SUBST(privatedir)]
-)
-
 #################################################
 # set configuration directory location
 configdir="\$(LIBDIR)"
diff --git a/vfs/samba/param/loadparm.c b/vfs/samba/param/loadparm.c
index 2588802c2..af52c1b8e 100644
--- a/vfs/samba/param/loadparm.c
+++ b/vfs/samba/param/loadparm.c
@@ -841,13 +841,7 @@ static void init_globals(void)
 
   DEBUG(3,("Initialising global parameters\n"));
 
-  string_set(&Globals.szSMBPasswdFile, SMB_PASSWD_FILE);
-  /*
-   * Allow the default PASSWD_CHAT to be overridden in local.h.
-   */
-  string_set(&Globals.szPasswdChat,DEFAULT_PASSWD_CHAT);
   string_set(&Globals.szWorkGroup, WORKGROUP);
-  string_set(&Globals.szPasswdProgram, PASSWD_PROGRAM);
   string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
   string_set(&Globals.szDriverFile, DRIVERFILE);
   string_set(&Globals.szRootdir, "/");