diff --git a/Makefile.am b/Makefile.am
index 8657f82148..bb73517704 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -682,6 +682,7 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST)   \
 # Deletes all the files generated by autogen.sh.
 MAINTAINERCLEANFILES =   \
   aclocal.m4             \
+  ar-lib                 \
   config.guess           \
   config.sub             \
   configure              \
diff --git a/conformance/Makefile.am b/conformance/Makefile.am
index 0e76b16add..1c022270e6 100644
--- a/conformance/Makefile.am
+++ b/conformance/Makefile.am
@@ -10,6 +10,7 @@ protoc_outputs =                                               \
 other_language_protoc_outputs =                                \
   conformance.rb                                               \
   com/google/protobuf/conformance/Conformance.java             \
+  conformance_pb2.py                                           \
   Conformance.pbobjc.h                                         \
   Conformance.pbobjc.m