diff --git a/.gitignore b/.gitignore
index fa83b0e..e9ab4a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 cscope.in.out
 cscope.out
 cscope.po.out
+fedfs-utils-*.tar.gz
 ChangeLog
 Doxygen/
 .*.swp
diff --git a/Makefile.am b/Makefile.am
index 7a92ced..b374969 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,8 @@ AUTOMAKE_OPTIONS	= foreign
 SUBDIRS			= doc src contrib
 dist_noinst_SCRIPTS	= autogen.sh
 EXTRA_DIST		= ChangeLog COPYING README INSTALL doxy.cfg .gitignore
-CLEANFILES		= cscope.in.out cscope.out cscope.po.out
+
+CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
 DISTCLEANFILES		= Makefile.in ChangeLog
 
 ChangeLog:
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 09c3763..7d68051 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -24,5 +24,6 @@
 ##
 
 SUBDIRS			= init-scripts
-CLEANFILES		= cscope.in.out cscope.out cscope.po.out
+
+CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
 DISTCLEANFILES		= Makefile.in
diff --git a/contrib/init-scripts/Makefile.am b/contrib/init-scripts/Makefile.am
index 6136075..a168a65 100644
--- a/contrib/init-scripts/Makefile.am
+++ b/contrib/init-scripts/Makefile.am
@@ -24,5 +24,6 @@
 ##
 
 EXTRA_DIST		= rpcfedfsd
-CLEANFILES		= cscope.in.out cscope.out cscope.po.out
+
+CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
 DISTCLEANFILES		= Makefile.in
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6acc741..8ee4c63 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -25,5 +25,6 @@
 
 EXTRA_DIST		= CheckInTests
 SUBDIRS			= man ldap rpcl
-CLEANFILES		= cscope.in.out cscope.out cscope.po.out
+
+CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
 DISTCLEANFILES		= Makefile.in
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 2c105af..c9ddfe8 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -39,7 +39,8 @@ NSDB_CLIENT_CMDS	= nsdb-create-fsl.8 nsdb-create-fsn.8 \
 dist_man7_MANS		= fedfs.7
 dist_man8_MANS		= rpc.fedfsd.8 mount.fedfs.8 fedfs-map-nfs4.8 \
 			  nsdbparams.8 $(FEDFS_CLIENT_CMDS) $(NSDB_CLIENT_CMDS)
-CLEANFILES		= cscope.in.out cscope.out cscope.po.out
+
+CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
 DISTCLEANFILES		= Makefile.in
 
 dist-hook:
diff --git a/doc/rpcl/Makefile.am b/doc/rpcl/Makefile.am
index b45aa6a..488b382 100644
--- a/doc/rpcl/Makefile.am
+++ b/doc/rpcl/Makefile.am
@@ -32,7 +32,8 @@ GENFILES		= $(GENFILES_CLNT) $(GENFILES_SVC) $(GENFILES_XDR) \
 
 EXTRA_DIST		= fedfs_admin.x
 BUILT_SOURCES		= $(GENFILES)
-CLEANFILES		= $(GENFILES) cscope.in.out cscope.out cscope.po.out
+
+CLEANFILES		= $(GENFILES) cscope.in.out cscope.out cscope.po.out *~
 DISTCLEANFILES		= Makefile.in
 
 $(GENFILES_H): %.h: %.x $(RPCGEN)
diff --git a/src/Makefile.am b/src/Makefile.am
index ae32fdf..2b03192 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,5 +27,6 @@ SUBDIRS			= include libxlog libadmin libnsdb libjunction \
 			  libparser libpath libsi \
 			  fedfsc fedfsd nsdbc nsdbparams resolve-junction \
 			  mount
-CLEANFILES		= cscope.in.out cscope.out cscope.po.out
+
+CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
 DISTCLEANFILES		= Makefile.in
diff --git a/src/fedfsc/Makefile.am b/src/fedfsc/Makefile.am
index 3c0cfdf..c91a102 100644
--- a/src/fedfsc/Makefile.am
+++ b/src/fedfsc/Makefile.am
@@ -37,7 +37,8 @@ LDADD			= $(LIBTIRPC) $(LIBLDAP) $(LIBLBER) \
 			  $(top_builddir)/src/libnsdb/libnsdb.a \
 			  $(top_builddir)/src/libpath/libpath.a \
 			  $(top_builddir)/src/libxlog/libxlog.a
-CLEANFILES		= cscope.in.out cscope.out cscope.po.out
+
+CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
 DISTCLEANFILES		= Makefile.in
 
 AM_CFLAGS		= -ggdb -fstrict-aliasing -fpie -Wall -Wextra \
diff --git a/src/fedfsd/Makefile.am b/src/fedfsd/Makefile.am
index 4b313eb..78bfc90 100644
--- a/src/fedfsd/Makefile.am
+++ b/src/fedfsd/Makefile.am
@@ -34,7 +34,8 @@ fedfsd_LDADD		= $(LIBTIRPC) $(LIBLDAP) $(LIBLBER) \
 			  $(top_builddir)/src/libjunction/libjunction.a \
 			  $(top_builddir)/src/libpath/libpath.a \
 			  $(top_builddir)/src/libxlog/libxlog.a
-CLEANFILES		= cscope.in.out cscope.out cscope.po.out
+
+CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
 DISTCLEANFILES		= Makefile.in
 
 AM_CFLAGS		= -ggdb -fstrict-aliasing -fpie -Wall -Wextra \
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index c875ac1..6244670 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -26,5 +26,6 @@
 noinst_HEADERS		= fedfs_admin.h fedfs.h getsrvinfo.h gpl-boiler.h \
 			  junction.h list.h nsdb.h parse_opt.h path.h \
 			  token.h xlog.h
-CLEANFILES		= cscope.in.out cscope.out cscope.po.out
+
+CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
 DISTCLEANFILES		= Makefile.in
diff --git a/src/libadmin/Makefile.am b/src/libadmin/Makefile.am
index d48f698..ac0095b 100644
--- a/src/libadmin/Makefile.am
+++ b/src/libadmin/Makefile.am
@@ -25,7 +25,8 @@
 
 noinst_LIBRARIES	= libadmin.a
 libadmin_a_SOURCES	= fedfs_admin_clnt.c fedfs_admin_svc.c fedfs_admin_xdr.c
-CLEANFILES		= cscope.in.out cscope.out cscope.po.out
+
+CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
 DISTCLEANFILES		= Makefile.in
 
 # Squelch compiler warnings for rpcgen-produced source code
diff --git a/src/libjunction/Makefile.am b/src/libjunction/Makefile.am
index c4cce62..b9e7b1a 100644
--- a/src/libjunction/Makefile.am
+++ b/src/libjunction/Makefile.am
@@ -25,7 +25,8 @@
 
 noinst_LIBRARIES	= libjunction.a
 libjunction_a_SOURCES	= junction.c
-CLEANFILES		= cscope.in.out cscope.out cscope.po.out
+
+CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
 DISTCLEANFILES		= Makefile.in
 
 AM_CFLAGS		= -ggdb -fstrict-aliasing -fpie -Wall -Wextra \
diff --git a/src/libnsdb/Makefile.am b/src/libnsdb/Makefile.am
index 3654c93..ddf770d 100644
--- a/src/libnsdb/Makefile.am
+++ b/src/libnsdb/Makefile.am
@@ -27,7 +27,8 @@ noinst_HEADERS		= nsdb-internal.h
 noinst_LIBRARIES	= libnsdb.a
 libnsdb_a_SOURCES	= administrator.c annotation.c display.c fileserver.c \
 			  ldap.c nsdb.c sqlite.c
-CLEANFILES		= cscope.in.out cscope.out cscope.po.out
+
+CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
 DISTCLEANFILES		= Makefile.in
 
 AM_CFLAGS		= -ggdb -fstrict-aliasing -fpie -Wall -Wextra \
diff --git a/src/libparser/Makefile.am b/src/libparser/Makefile.am
index f24d344..2ef8549 100644
--- a/src/libparser/Makefile.am
+++ b/src/libparser/Makefile.am
@@ -25,7 +25,8 @@
 
 noinst_LIBRARIES	= libparser.a
 libparser_a_SOURCES	= parse_opt.c token.c
-CLEANFILES		= cscope.in.out cscope.out cscope.po.out
+
+CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
 DISTCLEANFILES		= Makefile.in
 
 AM_CFLAGS		= -ggdb -fstrict-aliasing -fpie -Wall -Wextra \
diff --git a/src/libpath/Makefile.am b/src/libpath/Makefile.am
index 0a443cb..3b13423 100644
--- a/src/libpath/Makefile.am
+++ b/src/libpath/Makefile.am
@@ -25,7 +25,8 @@
 
 noinst_LIBRARIES	= libpath.a
 libpath_a_SOURCES	= path.c
-CLEANFILES		= cscope.in.out cscope.out cscope.po.out
+
+CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
 DISTCLEANFILES		= Makefile.in
 
 AM_CFLAGS		= -ggdb -fstrict-aliasing -fpie -Wall -Wextra \
diff --git a/src/libsi/Makefile.am b/src/libsi/Makefile.am
index 2924168..af9fe8c 100644
--- a/src/libsi/Makefile.am
+++ b/src/libsi/Makefile.am
@@ -25,7 +25,8 @@
 
 noinst_LIBRARIES	= libsi.a
 libsi_a_SOURCES		= getsrvinfo.c
-CLEANFILES		= cscope.in.out cscope.out cscope.po.out
+
+CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
 DISTCLEANFILES		= Makefile.in
 
 AM_CFLAGS		= -ggdb -fstrict-aliasing -fpie -Wall -Wextra \
diff --git a/src/libxlog/Makefile.am b/src/libxlog/Makefile.am
index 124df23..677e7b8 100644
--- a/src/libxlog/Makefile.am
+++ b/src/libxlog/Makefile.am
@@ -25,7 +25,8 @@
 
 noinst_LIBRARIES	= libxlog.a
 libxlog_a_SOURCES	= xlog.c
-CLEANFILES		= cscope.in.out cscope.out cscope.po.out
+
+CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
 DISTCLEANFILES		= Makefile.in
 
 AM_CFLAGS		= -ggdb -fstrict-aliasing -fpie -Wall -Wextra \
diff --git a/src/mount/Makefile.am b/src/mount/Makefile.am
index 9a97fb4..7dbab03 100644
--- a/src/mount/Makefile.am
+++ b/src/mount/Makefile.am
@@ -33,7 +33,8 @@ mount_fedfs_SOURCES	= main.c
 # mount.fedfs must never link against libraries in /usr
 mount_fedfs_LDADD	= $(LIBRESOLV) \
 			  $(top_builddir)/src/libsi/libsi.a
-CLEANFILES		= cscope.in.out cscope.out cscope.po.out
+
+CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
 DISTCLEANFILES		= Makefile.in
 
 AM_CFLAGS		= -ggdb -fstrict-aliasing -fpie -Wall -Wextra \
diff --git a/src/nsdbc/Makefile.am b/src/nsdbc/Makefile.am
index e409d9b..1f8b79f 100644
--- a/src/nsdbc/Makefile.am
+++ b/src/nsdbc/Makefile.am
@@ -34,7 +34,8 @@ LDADD			= $(LIBLDAP) $(LIBLBER) \
 			  $(top_builddir)/src/libxlog/libxlog.a \
 			  $(top_builddir)/src/libjunction/libjunction.a \
 			  $(top_builddir)/src/libpath/libpath.a
-CLEANFILES		= cscope.in.out cscope.out cscope.po.out
+
+CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
 DISTCLEANFILES		= Makefile.in
 
 AM_CFLAGS		= -ggdb -fstrict-aliasing -fpie -Wall -Wextra \
diff --git a/src/nsdbparams/Makefile.am b/src/nsdbparams/Makefile.am
index 9807743..a9a0fa1 100644
--- a/src/nsdbparams/Makefile.am
+++ b/src/nsdbparams/Makefile.am
@@ -31,7 +31,8 @@ LDADD			= $(LIBLDAP) $(LIBLBER) \
 			  $(top_builddir)/src/libjunction/libjunction.a \
 			  $(top_builddir)/src/libpath/libpath.a \
 			  $(top_builddir)/src/libxlog/libxlog.a
-CLEANFILES		= cscope.in.out cscope.out cscope.po.out
+
+CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
 DISTCLEANFILES		= Makefile.in
 
 AM_CFLAGS		= -ggdb -fstrict-aliasing -fpie -Wall -Wextra \
diff --git a/src/resolve-junction/Makefile.am b/src/resolve-junction/Makefile.am
index 90508a3..9149042 100644
--- a/src/resolve-junction/Makefile.am
+++ b/src/resolve-junction/Makefile.am
@@ -34,7 +34,8 @@ LDADD			= $(LIBLDAP) $(LIBLBER) \
 			  $(top_builddir)/src/libjunction/libjunction.a \
 			  $(top_builddir)/src/libpath/libpath.a \
 			  $(top_builddir)/src/libxlog/libxlog.a
-CLEANFILES		= cscope.in.out cscope.out cscope.po.out
+
+CLEANFILES		= cscope.in.out cscope.out cscope.po.out *~
 DISTCLEANFILES		= Makefile.in
 
 AM_CFLAGS		= -ggdb -fstrict-aliasing -fpie -Wall -Wextra \
