diff --git a/build/package/common/root-cint.install.in b/build/package/common/root-cint.install.in
index 00f90aaab8d9644bdcb999bf0636e62a4e76e4df..df319c41112397413d2744a8c1567d4a62a635cf 100644
--- a/build/package/common/root-cint.install.in
+++ b/build/package/common/root-cint.install.in
@@ -1,4 +1,3 @@
-@prefix@/lib/root/cint
 @prefix@/lib/root/@version@/cint
 @prefix@/bin/cint
 @prefix@/bin/makecint
diff --git a/build/package/common/root-plugin-minuit2.control b/build/package/common/root-plugin-minuit2.control
new file mode 100644
index 0000000000000000000000000000000000000000..23b95b1af382027533e3b63a856d8899121e5c49
--- /dev/null
+++ b/build/package/common/root-plugin-minuit2.control
@@ -0,0 +1,10 @@
+Package: root-plugin-minuit2
+Architecture: any
+Depends: ${shlibs:Depends}
+Provides: root-fitter
+Description: Minuit version 2 plugin for ROOT
+ This package contains the MINUIT version 2 plug-in for ROOT.  This 
+ provides an fitting algorithm for ROOT.
+ .
+ ROOT web-site: http://root.cern.ch
+
diff --git a/build/package/common/root-proofd.control b/build/package/common/root-proofd.control
index b53212d36f9d6ce5b16d4d3bf65193d39da11869..c5568c94e8bce6a7b5a7992dde9fa8395d589158 100644
--- a/build/package/common/root-proofd.control
+++ b/build/package/common/root-proofd.control
@@ -1,5 +1,6 @@
 Package: root-proofd
 Architecture: any
+Pre-Depends: netbase
 Depends: ${shlibs:Depends}
 Recommends: root-bin, libroot-dev, root-file-server | root-rootd
 Description: Parallel ROOt Facility - distributed, parallel computing
diff --git a/build/package/debian/changelog b/build/package/debian/changelog
index 13a5df673133f139e28665f5c35f542bd52933b7..e589fee01d4bd01f90a74c406898cc6d8701fe7a 100644
--- a/build/package/debian/changelog
+++ b/build/package/debian/changelog
@@ -1,3 +1,15 @@
+root (5.06.01-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Christian Holm Christensen <cholm@cholm>  Wed, 16 Nov 2005 10:46:04 +0100
+
+root (5.05.01-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Christian Holm Christensen <cholm@cholm>  Wed, 12 Oct 2005 00:41:44 +0200
+
 root (5.04.00-2) unstable; urgency=low
 
   * Some new stuff to handle the libraries and plugins installed by the
diff --git a/build/package/debian/rules b/build/package/debian/rules
index d5eafe88890b858e018f519d72821160f6d2e96c..e0a5b8ceea2d7b8c4c9cf767e1670d2b6f01b195 100644
--- a/build/package/debian/rules
+++ b/build/package/debian/rules
@@ -21,11 +21,13 @@ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 PREFIX		= /usr
 SYSCONFDIR	= /etc
-PKGDOCDIR	= /usr/share/doc/root
+PKGDOCDIR	= $(PREFIX)/share/doc/root
+CINTDIR		= $(PREFIX)/lib/root/$(SOVERS)/cint
 CONFOPTIONS	:=--enable-table				\
 		  --enable-roofit				\
 		  --enable-ruby					\
 		  --enable-qt					\
+		  --enable-minuit2				\
 		  --enable-pythia				\
 		  --enable-xrootd				\
 		  --enable-shared				\
@@ -84,13 +86,13 @@ configure-stamp:$(TEMPLATES:%.in=%) config.status
 config.status: configure 
 	dh_testdir
 	# Add here commands to configure the package.
-	./configure --prefix=$(PREFIX) 				\
-		    --mandir=$(PREFIX)/share/man/man1		\
-		    --docdir=$(PKGDOCDIR)			\
-		    --cintincdir=$(PREFIX)/lib/root/cint	\
-		    --etcdir=$(SYSCONFDIR)/root			\
-		    --with-sys-iconpath=$(PREFIX)/share/pixmaps	\
-		    --libdir=$(PREFIX)/lib/root/$(SOVERS)	\
+	./configure --prefix=$(PREFIX) 					\
+		    --mandir=$(PREFIX)/share/man/man1			\
+		    --docdir=$(PKGDOCDIR)				\
+		    --cintincdir=$(CINTDIR)				\
+		    --etcdir=$(SYSCONFDIR)/root				\
+		    --with-sys-iconpath=$(PREFIX)/share/pixmaps		\
+		    --libdir=$(PREFIX)/lib/root/$(SOVERS)		\
 		    $(CONFOPTIONS)
 	touch configure-stamp
 
@@ -199,12 +201,12 @@ install-arch:
 		-Xusr/lib/root/$(SOVERS)/lib*.so.$(MAJOR)
 
 	# Fix some permissions 
-	find debian/root-bin/usr/share/root/icons \
+	-find debian/root-bin/usr/share/root/icons \
 		-perm 0755 -and -not -type d | xargs chmod a-x 
-	find debian/root-cint/usr/lib/root/cint \
+	-find debian/root-cint/$(CINTDIR) \
 		-perm 755 -and -not -type d | xargs chmod a-x 
-	chmod a+x debian/root-cint/usr/lib/root/cint/lib/pthread/setup
-	chmod a+x debian/root-cint/usr/lib/root/cint/include/makehpib
+	-chmod a+x debian/root-cint/$(CINTDIR)/lib/pthread/setup
+	-chmod a+x debian/root-cint/$(CINTDIR)/include/makehpib
 	-chmod a-x debian/root-plugin-python/usr/lib/root/$(SOVERS)/ROOT.py
 	# Install desktop entry and icon 
 	mkdir -p debian/root-bin/usr/share/applications
@@ -252,7 +254,8 @@ binary-common:
 	dh_makeshlibs -n -V
 	dh_installdeb
 #	dh_shlibdeps $(PKGLIST:%=-L%) $(PKGLIST:%=-ldebian/%/usr/lib/root)
-	dh_shlibdeps $(SPKGLIST:%=-L%) -l$(shell echo $(SPKGLIST:%=debian/%/usr/lib/root) | tr ' ' ':')
+	dh_shlibdeps $(SPKGLIST:%=-L%) \
+	  -l$(shell echo $(SPKGLIST:%=debian/%/usr/lib/root) | tr ' ' ':')
 	dh_gencontrol
 	dh_md5sums
 # Build architecture independant packages using the common target.
diff --git a/build/package/lib/makebuilddepend.sh b/build/package/lib/makebuilddepend.sh
index 5758bf57ce4aed0b488cfa0c3b102eaa33ecae9f..d0fb5166f138e53dd1fcdeaa302c56fb409979bb 100755
--- a/build/package/lib/makebuilddepend.sh
+++ b/build/package/lib/makebuilddepend.sh
@@ -27,6 +27,7 @@ if test "x$1" = "xrpm" ; then
 	    *krb5)	echo -n ", krb5-devel"				;;
 	    *ldap)	echo -n ", openldap-devel"			;;
 	    *minuit)							;;
+	    *minuit2)							;;
 	    *mlp)							;;
 	    *mysql)	echo -n ", mysql-devel"				;;
 	    *netx)							;;
@@ -84,6 +85,7 @@ for i in $* ; do
 	*ldap)		echo -n ", libldap-dev"				;;
 	*oracle)    	echo -n ", oracle-instantclient-devel"		;;
 	*minuit)							;;
+	*minuit2)							;;
 	*mlp)								;;
 	*mysql)		echo -n ", libmysqlclient-dev | libmysqlclient12-dev | libmysqlclient14-dev" ;;
 	*netx)								;;
diff --git a/build/package/lib/makelists.sh b/build/package/lib/makelists.sh
index f441f230aa1e64255757a0ad2a6c44adf6f33df8..3a60013119eda9536ad3dafb85dff6ce82238840 100755
--- a/build/package/lib/makelists.sh
+++ b/build/package/lib/makelists.sh
@@ -39,7 +39,7 @@ for d in * ; do
 	            lib=libroot             ; dev=libroot-dev; bin=root-bin ;;
 	matrix|meta*|net|newdelete|physics|postscript|rint|table|thread|tree*) 
 	            lib=libroot             ; dev=libroot-dev; bin=root-bin ;;
-	unix|utils|vmc|x11*|x3d|zip|rpdutils|rootx|xml) 	
+	unix|utils|vmc|x11*|x3d|zip|rpdutils|rootx|splot|xml) 	
 	            lib=libroot             ; dev=libroot-dev; bin=root-bin ;;
 	globusauth) lib=root-plugin-globus  ; dev=$lib       ; bin=$lib ;;  
 	qtroot)     lib=root-plugin-qt      ; dev=$lib       ; bin=$lib ;;
diff --git a/config/Makefile.in b/config/Makefile.in
index bfe400e1ff8a728d159f85533998a6d7f66baf76..5e6b91a4e89090c40ae1264f285f6cb18ad01861 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -124,9 +124,10 @@ BUILDFPYTHIA   := @buildpythia@
 FPYTHIALIBDIR  := @pythialibdir@
 FPYTHIALIB     := @pythialib@
 
-BUILDFPYTHIA6  := @buildpythia6@
-FPYTHIA6LIBDIR := @pythia6libdir@
-FPYTHIA6LIB    := @pythia6lib@
+BUILDFPYTHIA6    := @buildpythia6@
+FPYTHIA6LIBDIR   := @pythia6libdir@
+FPYTHIA6LIB      := @pythia6lib@
+FPYTHIA6CPPFLAGS := @pythia6cppflags@
 
 BUILDFVENUS    := @buildvenus@
 FVENUSLIBDIR   := @venuslibdir@
diff --git a/configure b/configure
index 0f2db472bedc02dd57d54c9d219fad547ed8f790..9d310651ddbe9a858c1e1d88f56c132148f21415 100755
--- a/configure
+++ b/configure
@@ -1611,6 +1611,27 @@ if test ! "x$enable_pythia6" = "xno" ; then
 
     if test "x$pythia6lib" = "x" ; then
         enable_pythia6=no
+    else
+	check_symbol pythia6_common_block_address__ \
+	    "$found_lib" "$found_dir"
+	if test $found_symbol -eq 1 ; then
+	    pythia6cppflags=-DPYTHIA6_DOUBLE_UNDERSCORE
+	else
+	    check_symbol pythia6_common_block_address_ \
+		"$found_lib" "$found_dir"
+	    if test $found_symbol -eq 1  ; then
+		pythia6cppflags=-DPYTHIA6_SINGLE_UNDERSCORE
+	    else
+		check_symbol pythia6_common_address \
+		    "$found_lib" "$found_dir"
+		if test $found_symbol -eq 1  ; then
+		    pythia6cppflags=-DPYTHIA6_NO_UNDERSCORE
+		else
+		    echo " didn't find pythia6_common_block_address[_]* in $found_lib"
+		    enable_pythia6=no
+		fi
+	    fi
+	fi
     fi
 fi
 
@@ -3000,6 +3021,7 @@ if test "x$show_pkglist" = "xyes" ; then
     test "x$enable_globus"  = "xyes" && pkglist="$pkglist root-plugin-globus"
     test "x$enable_krb5"    = "xyes" && pkglist="$pkglist root-plugin-krb5"
     test "x$enable_ldap"    = "xyes" && pkglist="$pkglist root-plugin-ldap"
+    test "x$enable_minuit2" = "xyes" && pkglist="$pkglist root-plugin-minuit2"
     test "x$enable_mysql"   = "xyes" && pkglist="$pkglist root-plugin-mysql"
     test "x$enable_opengl"  = "xyes" && pkglist="$pkglist root-plugin-gl"
     test "x$enable_oracle"  = "xyes" && pkglist="$pkglist root-plugin-oracle"
@@ -3306,6 +3328,7 @@ sed -e "s|@ldflags@||"                          \
     -e "s|@proofdir@|$proofdir|"                \
     -e "s|@pythia6lib@|$pythia6lib|"            \
     -e "s|@pythia6libdir@|$pythia6libdir|"      \
+    -e "s|@pythia6cppflags@|$pythia6cppflags|"  \
     -e "s|@pythialib@|$pythialib|"              \
     -e "s|@pythialibdir@|$pythialibdir|"        \
     -e "s|@pythonlib@|$pythonlib|"              \
diff --git a/man/man1/xrdcp.1 b/man/man1/xrdcp.1
new file mode 100644
index 0000000000000000000000000000000000000000..d22eb3a66d535a6a2b4bcb040da3f5b7533d7285
--- /dev/null
+++ b/man/man1/xrdcp.1
@@ -0,0 +1,176 @@
+.\"
+.\" $Id: xrdcp.1,v 1.2 2005/09/07 10:23:23 rdm Exp $
+.\"
+.TH XRDCP 1 "Version 3" "ROOT"
+.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
+.\" other parms are allowed: see man(7), man(1)
+.SH NAME
+xrdcp \- XRootD utility to copy files to/from nodes
+.SH SYNOPSIS
+.B xrdcp
+.I  SOURCE
+.I  DEST
+.RI [ OPTIONS ]
+.SH "DESCRIPTION"
+.B Xrdcp 
+is a 
+.BI cp -like(1) 
+tool to copy files:
+.TP
+* 
+\fIFROM\fR an \fBxrootd\fR system \fITO\fR a local file system
+
+.TP
+*
+\fIFROM\fR an \fRBxrootd\R system \fITO\fR an \fBxrootd\fR system
+(even the same) 
+
+.TP
+*
+\fIFROM\fR a local file system \fITO\fR an \fBxrootd\fR system
+.SH "OPTIONS"
+.TP
+.BI \-d LEVEL
+Set the debug level
+.TP
+.BI \-D "param value"
+Set parameter \fIparam\fR to string or integer \fIvalue\fR.
+.TP
+.B \-np
+No progress bar
+.TP
+.B \-s
+Silent mode, no summary or progress bar
+.TP
+.B \-OS
+Adds some opaque information to any \fISOURCE\fR \fBxrootd\fR URL
+.TP
+.B \-OD
+Adds some opaque information to any \fIDEST\fR \fBxrootd\fR URL
+.TP
+.B \-f
+Force overwrite destination.
+.TP
+.B \-force 
+At least one reconnection attempts to retry file up to 1 week, to
+block until \fBxrdcp\fR is executed.
+.TP
+.B \-R
+Recursive copy directories.
+.SH "PARAMETERS"
+Here is the list of the internal parameters of XrdClient, with their meaning.
+The parameters names are case sensitive.
+.TP
+.BR ConnectTimeout " (default: 60)"
+The timeout value for connection attempts at the init of an instance.
+Any timeout will be internally treated as a recoverable error, and
+handled in some way, typically retrying. Note that a connection
+attempt may fail before this time.
+.TP
+.BR RequestTimeout " (default: 60)"
+The timeout value for send/receive attempts. Any timeout will be
+internally treated as a recoverable error, and handled in some way,
+typically auto-redirecting to the first redirector encountered.
+.TP
+.BR MaxRedirectcount " (default: 255)"
+If a client gets redirected or auto-redirected more times than this
+number in the last RedirCntTimeout seconds, the pending operation will
+be abandoned.
+.TP
+.BR RedirCntTimeout " (default: 3600)"
+See up.
+.TP
+.BR DebugLevel " (default: 0)"
+Verbosity of the printed output.
+.br
+-1 = no printing at all
+.br
+0 = print only errors, and a few more.
+.br
+1 = really basic trace of what's happening
+.br
+2 = trace of what is the client doing
+.br
+3 = Ultra-verbose: dump every data exchange
+.br
+4 = Hyper-verbose: dump everything flowing through sockets
+.TP
+.BR ReconnectTimeout " (default: 10)"
+The timeout value for re-connection attempts. Any timeout will be
+internally treated as a recoverable error, and handled in some way,
+typically retrying. Note that a connection attempt may fail before
+this time. 
+.TP
+.BR FirstConnectMaxCnt " (default: 150)"
+How many times the connection on initialization will be retried, in
+the case of error.
+.TP
+.BR StartGarbageCollectorThread " (default: 1)"
+A really paranoid parameter. If set to 0, the physical/logical
+connections are no more closed if inactive. 
+.TP
+.BR GoAsync " (default: 1)"
+Choose between the sync/async internal architecture. The sync one is
+unable to handle unsolicited responses, and will never be. 
+.TP
+.BR ReadCacheSize " (default: 4000000)"
+The max size of the read cache. One cache per instance. Set to 0 to
+disable caching. 
+.TP
+.BR ReadAheadSize " (default: 800000)"
+The size of the blocks requested and populating the cache.
+.TP
+.BR RedirDomainAllowRE " (default: Internally computed to allow only operations on the local domain.)"
+Given a list of \fB|\fR-separated regexps for the domains to ALLOW
+REDIR to, match every entry with domain. If NO match is found, deny
+access. Only \fB*\fR is allowed in the regexps, and only at the
+beginning or the end of the single exprs
+.TP
+.BR RedirDomainDenyRE " (default: Internally computed to allow only operations on the local domain.)"
+Given a list of \fB|\fR-separated regexps for the domains to DENY
+REDIR to, match every entry with domain. If ANY match is found, deny
+access. Only \fB*\fR is allowed in the regexps, and only at the
+beginning or the end of the single exprs
+.TP
+.BR ConnectDomainAllowRE " (default: Internally computed to allow only operations  on the local domain.)"
+Given a list of \fB|\fR-separated regexps for the domains to ALLOW
+CONNECT to, match every entry with domain. If NO match is found, deny
+access. Only \fB*\fR is allowed in the regexps, and only at the
+beginning or the end of the single exprs
+.TP
+.BR ConnectDomainDenyRE " (default: Internally computed to allow only operations on the local domain.)"
+Given a list of \fB|\fR-separated regexps for the domains to DENY
+CONNECT to, match every entry with domain. If ANY match is found, deny
+access. Only \fB*\fR is allowed in the regexps, and only at the
+beginning or the end of the single exprs
+
+.SH "SEE ALSO"
+\fIroot\fR(1), \fIxrootd\fR(1)
+.PP
+See also the \fBROOT\fR webpages:
+.US http://root.cern.ch
+\fIhttp://root.cern.ch\fR
+.UE
+.SH "ORIGINAL AUTHORS"
+G. Ganis
+.SH "COPYRIGHT"
+This library is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of the
+License, or (at your option) any later version.
+.P
+This library is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+.P
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+.SH AUTHOR 
+This manual page was written by Christian Holm Christensen
+<cholm@nbi.dk>, for the Debian GNU/Linux system (but may be used by
+others). 
+.\"
+.\" EOF
+.\"
diff --git a/pythia6/Module.mk b/pythia6/Module.mk
index 2fd90a55f33593e6edfcbe5a5b30d977346bfe61..dd4f899913876107bb6ca1460ff99a8ba732ab19 100644
--- a/pythia6/Module.mk
+++ b/pythia6/Module.mk
@@ -66,3 +66,7 @@ distclean-pythia6: clean-pythia6
 		@rm -f $(PYTHIA6DEP) $(PYTHIA6DS) $(PYTHIA6DH) $(PYTHIA6LIB)
 
 distclean::     distclean-pythia6
+
+##### extra rules ######
+$(PYTHIA6O):    %.o: %.cxx
+		$(CXX) $(OPT) $(CXXFLAGS) $(FPYTHIA6CPPFLAGS) -I. -o $@ -c $<
diff --git a/pythia6/src/TPythia6.cxx b/pythia6/src/TPythia6.cxx
index 0382e20664a566e09aa0fb5577a18c2b154bea03..403558ca9f96de55f5a7122632bad89e60ee52b0 100644
--- a/pythia6/src/TPythia6.cxx
+++ b/pythia6/src/TPythia6.cxx
@@ -1,4 +1,4 @@
-// @(#)root/pythia6:$Name:  $:$Id: TPythia6.cxx,v 1.18 2005/09/04 16:37:43 brun Exp $
+// @(#)root/pythia6:$Name:  $:$Id: TPythia6.cxx,v 1.19 2005/09/04 19:08:11 brun Exp $
 // Author: Rene Brun   19/10/99
 //
 ////////////////////////////////////////////////////////////////////////////////
@@ -84,8 +84,15 @@ TPythia6*  TPythia6::fgInstance = 0;
 # define pystat pystat_
 # define pytest pytest_
 # define pyupda pyupda_
-# define tpythia6_open_fortran_file tpythia6_open_fortran_file_
-# define tpythia6_close_fortran_file tpythia6_close_fortran_file_
+# ifdef PYTHIA6_DOUBLE_UNDERSCORE
+#  define tpythia6_open_fortran_file tpythia6_open_fortran_file__
+#  define tpythia6_close_fortran_file tpythia6_close_fortran_file__
+#  define pythia6_common_address pythia6_common_block_address__
+# elif PYTHIA6_SINGLE_UNDERSCORE
+#  define tpythia6_open_fortran_file tpythia6_open_fortran_file_
+#  define tpythia6_close_fortran_file tpythia6_close_fortran_file_
+#  define pythia6_common_address pythia6_common_block_address_
+# endif
 # define type_of_call
 #else
 # define pyevnt PYEVNT