diff --git a/.gitignore b/.gitignore
index a592c25281..0e8d4dfdb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,19 +24,121 @@
 /win_build/installerv2/redist/Windows/src/boinccas/Release95
 /win_build/installerv2/redist/Windows/src/boinccas/x64
 
+# Netbeans project files
+/html/nbproject/
+
 #
 *.pfx
 *.pvk
 *.spc
-*.o
-*.lo
-*.a
-*.la
-*.in
-/client/Makefile
 /win_build/*.filters
 /win_build/boinc.sdf
 /win_build/boinc.opensdf
 /win_build/ipch
 /win_build/installerv2/redist/Windows/src/boinccas/*.filters
 /win_build/installerv2/redist/Windows/src/boinccas/boinccas.sdf
+
+## files created by _autosetup (autoreconf):
+*.in
+*.in~
+aclocal.m4
+autom4te.cache/
+compile
+config.guess
+config.sub
+configure
+depcomp
+install-sh
+ltmain.sh
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+missing
+test-driver
+
+## files created by configure:
+Makefile
+.deps/
+boinc_path_config.py
+pkginfo
+prototype
+client/scripts/boinc-client
+config.h
+config.log
+config.status
+libtool
+py/Boinc/version.py
+py/setup.py
+stamp-h1
+test/version.inc
+
+## files created by make:
+*.o
+*.lo
+*.a
+*.la
+.libs/
+svn_version.h
+# list of executables
+apps/1sec
+apps/concat
+apps/upper_case
+client/boinc
+client/boinc_client
+client/boinccmd
+client/switcher
+clientgui/boincmgr
+clientscr/boincscr
+doc/manpages/appmgr.8
+doc/manpages/boinc.1
+doc/manpages/boinccmd.1
+doc/manpages/boincmgr.1
+lib/crypt_prog
+lib/parse_test
+py/lib.*/
+sched/adjust_user_priority
+sched/antique_file_deleter
+sched/census
+sched/cgi
+sched/credit_test
+sched/db_dump
+sched/db_purge
+sched/delete_file
+sched/fcgi
+sched/fcgi_file_upload_handler
+sched/feeder
+sched/file_deleter
+sched/file_upload_handler
+sched/get_file
+sched/make_work
+sched/message_handler
+sched/put_file
+sched/sample_assimilator
+sched/sample_bitwise_validator
+sched/sample_dummy_assimilator
+sched/sample_substr_validator
+sched/sample_trivial_validator
+sched/sample_work_generator
+sched/sched_driver
+sched/show_shmem
+sched/single_job_assimilator
+sched/size_regulator
+sched/status
+sched/stop
+sched/transitioner
+sched/trickle_credit
+sched/trickle_deadline
+sched/trickle_echo
+sched/update_stats
+sched/wu_check
+tools/cancel_jobs
+tools/create_work
+tools/dir_hier_move
+tools/dir_hier_path
+tools/remote_submit_test
+tools/sign_executable
+vda/ssim
+vda/vda
+vda/vdad
\ No newline at end of file
diff --git a/_autosetup b/_autosetup
index 775bc604de..143de625f8 100755
--- a/_autosetup
+++ b/_autosetup
@@ -17,7 +17,7 @@ esac
 ## return 0 if ok, 1 too old or not found  (-> shell conventions).
 ## ----------------------------------------------------------------------
 check_version()
-{  
+{
     dir=`pwd`
     cd /tmp
     foundit=
@@ -30,7 +30,7 @@ check_version()
 	foundit=yes;
     fi
 
-    if [ "$foundit" != yes ]; then 
+    if [ "$foundit" != yes ]; then
 	echo "Didn't find application";
 	version=0
 	success=no
@@ -63,7 +63,7 @@ check_version()
 
 
   ## --------------------------------------------------------------------------------
-  ## 'MAIN' starts here 
+  ## 'MAIN' starts here
   ## --------------------------------------------------------------------------------
   echo "Bootstrapping configure script and makefiles:"
 
@@ -93,7 +93,7 @@ check_version()
          echo >/dev/null
       elif check_version gm4 1.4; then
          have_gm4=yes;
-      else 
+      else
          echo "Couldn't find a new-enough version of 'm4', please install one!";
          echo "If you have a newer version, set the environment variable 'M4' to its path";
          exit 1;
@@ -134,6 +134,10 @@ check_version()
 
   ## ---------- now run autoreconf
   cmdline="autoreconf -i";
+  ## -- if _autosetup was invoked with -f run autoreconf with -f to force a recreation of all files
+  if [ "x$1" == "x-f" ]; then
+    cmdline="autoreconf -i -f";
+  fi
 echo "$cmdline"
 if eval $cmdline; then
     echo "Done, now run ./configure"