diff --git a/backend/Makefile.am b/backend/Makefile.am
index 44d1e17fc..b628cb0a2 100644
--- a/backend/Makefile.am
+++ b/backend/Makefile.am
@@ -17,7 +17,12 @@ DIST_LIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)' -version-number $(V_MAJOR):
 LIBTOOL += --silent
 FIRMWARE_DIRS = artec_eplus48u gt68xx snapscan epjitsu
 
+# Needed by most backends as they add sane_strstatus.lo to their list
+# of libraries to link with via libsane_${BACKEND}_la_LIBADD.  Due to
+# the implicit dependency, automake does not notice the need to clean
+# up the dependency tracking file.
 EXTRA_DIST = sane_strstatus.c
+CLEANFILES = $(DEPDIR)/sane_strstatus.Plo
 
 all: becfg
 
@@ -133,7 +138,7 @@ uninstall-hook:
 	  rmdir $(DESTDIR)$(datadir)/sane/$${dir} ; \
 	done
 
-CLEANFILES = $(BACKEND_CONFS) $(be_convenience_libs)
+CLEANFILES += $(BACKEND_CONFS) $(be_convenience_libs)
 clean-local:
 	find . -type l -name \*-s.c | xargs rm -f
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 684815ab2..21e9f77d3 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -48,9 +48,9 @@ sane_find_scanner_LDADD = ../sanei/libsanei.la ../lib/liblib.la \
 gamma4scanimage_SOURCES = gamma4scanimage.c
 gamma4scanimage_LDADD = $(MATH_LIB)
 
-umax_pp_SOURCES = umax_pp.c
-umax_pp_LDADD = ../sanei/libsanei.la ../lib/liblib.la $(MATH_LIB) \
-	        ../backend/umax_pp_low.lo
+umax_pp_SOURCES  = umax_pp.c
+umax_pp_SOURCES += ../backend/umax_pp_low.c
+umax_pp_LDADD = ../sanei/libsanei.la ../lib/liblib.la $(MATH_LIB)
 
 sane_desc_SOURCES = sane-desc.c
 sane_desc_LDADD = ../sanei/libsanei.la ../lib/liblib.la