diff --git a/python/Makefile.am b/python/Makefile.am
index 57d3e75ea..8addbaa7c 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -44,19 +44,42 @@ nobase_pyexec_PYTHON = \
 nobase_pyexec_LTLIBRARIES = _buddy.la spot/_impl.la \
   spot/_ltsmin.la spot/_gen.la
 
+
 MAINTAINERCLEANFILES = \
   $(srcdir)/spot/impl_wrap.cxx $(srcdir)/spot/impl.py \
   $(srcdir)/spot/ltsmin_wrap.cxx $(srcdir)/spot/ltsmin.py \
   $(srcdir)/spot/gen_wrap.cxx $(srcdir)/spot/gen.py \
   $(srcdir)/buddy_wrap.cxx $(srcdir)/buddy.py
 
+DISTCLEANFILES = \
+  spot/$(DEPDIR)/impl_wrap.Pcxx spot/$(DEPDIR)/ltsmin_wrap.Pcxx \
+  spot/$(DEPDIR)/gen_wrap.Pcxx $(DEPDIR)/buddy_wrap.Pcxx
+
+## The # am--include-marker files are created by older version
+## of Automake when seeing the "# am--include-marker" used here
+## for Automake 1.16.
+clean-local:
+	rm -f '#' am--include-marker
+
+## Automake 1.16 fails to remove the __pycache__/* files.
+uninstall-local:
+	rm -rf $(DESTDIR)$(pyexecdir)/spot/__pycache__
+	rm -f $(DESTDIR)$(pyexecdir)/__pycache__/buddy.*
+
+# This is normally automatically generated by Automake, but we want
+# to append our own rules to it.
+am__depfiles_remade = ./$(DEPDIR)/buddy_wrap.Plo \
+        spot/$(DEPDIR)/gen_wrap.Plo spot/$(DEPDIR)/impl_wrap.Plo \
+        spot/$(DEPDIR)/ltsmin_wrap.Plo
+
 ## spot
 
 spot__impl_la_SOURCES = spot/impl_wrap.cxx
 spot__impl_la_LDFLAGS = -avoid-version -module $(SYMBOLIC_LDFLAGS)
 spot__impl_la_LIBADD = $(top_builddir)/spot/libspot.la
 
-@AMDEP_TRUE@@am__include@ @am__quote@./spot/$(DEPDIR)/impl_wrap.Pcxx@am__quote@
+am__depfiles_remade += ./spot/$(DEPDIR)/impl_wrap.Pcxx
+@AMDEP_TRUE@@am__include@ @am__quote@./spot/$(DEPDIR)/impl_wrap.Pcxx@am__quote@ # am--include-marker
 
 ${srcdir}/spot/impl_wrap.cxx: spot/impl.i
 	$(SWIG) $(SWIGFLAGS) -I$(srcdir) -I$(top_srcdir) -MF spot/$(DEPDIR)/impl_wrap.TPcxx $(srcdir)/spot/impl.i
@@ -73,7 +96,8 @@ spot__ltsmin_la_LDFLAGS = -avoid-version -module $(SYMBOLIC_LDFLAGS)
 spot__ltsmin_la_LIBADD = $(top_builddir)/spot/libspot.la \
                        $(top_builddir)/spot/ltsmin/libspotltsmin.la
 
-@AMDEP_TRUE@@am__include@ @am__quote@./spot/$(DEPDIR)/ltsmin_wrap.Pcxx@am__quote@
+am__depfiles_remade += ./spot/$(DEPDIR)/ltsmin_wrap.Pcxx
+@AMDEP_TRUE@@am__include@ @am__quote@./spot/$(DEPDIR)/ltsmin_wrap.Pcxx@am__quote@ # am--include-marker
 
 ${srcdir}/spot/ltsmin_wrap.cxx: spot/ltsmin.i
 	$(SWIG) $(SWIGFLAGS) -I$(srcdir) -I$(top_srcdir) -MF spot/$(DEPDIR)/ltsmin_wrap.TPcxx $(srcdir)/spot/ltsmin.i
@@ -90,7 +114,8 @@ spot__gen_la_LDFLAGS = -avoid-version -module $(SYMBOLIC_LDFLAGS)
 spot__gen_la_LIBADD = $(top_builddir)/spot/libspot.la \
                        $(top_builddir)/spot/gen/libspotgen.la
 
-@AMDEP_TRUE@@am__include@ @am__quote@./spot/$(DEPDIR)/gen_wrap.Pcxx@am__quote@
+am__depfiles_remade += ./spot/$(DEPDIR)/gen_wrap.Pcxx
+@AMDEP_TRUE@@am__include@ @am__quote@./spot/$(DEPDIR)/gen_wrap.Pcxx@am__quote@ # am--include-marker
 
 ${srcdir}/spot/gen_wrap.cxx: spot/gen.i
 	$(SWIG) $(SWIGFLAGS) -I$(srcdir) -I$(top_srcdir) -MF spot/$(DEPDIR)/gen_wrap.TPcxx $(srcdir)/spot/gen.i
@@ -105,7 +130,8 @@ spot/gen.py: spot/gen.i
 _buddy_la_SOURCES = buddy_wrap.cxx
 _buddy_la_LDFLAGS = -avoid-version -module $(BUDDY_LDFLAGS) $(SYMBOLIC_LDFLAGS)
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buddy_wrap.Pcxx@am__quote@
+am__depfiles_remade += ./$(DEPDIR)/buddy_wrap.Pcxx
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buddy_wrap.Pcxx@am__quote@ # am--include-marker
 
 ${srcdir}/buddy_wrap.cxx: buddy.i
 	$(SWIG) $(SWIGFLAGS) $(BUDDY_CPPFLAGS) -MF $(DEPDIR)/buddy_wrap.TPcxx $(srcdir)/buddy.i