diff --git a/autogen.sh b/autogen.sh
index 7d35f48d39..0679654a5e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -104,7 +104,7 @@ autoheader -f || bail_out
 # they are copied from the system so they can be used in a distribution.
 
 echo "Running automake --add-missing --copy"
-automake --add-missing -c  -Wno-portability > /dev/null || bail_out
+automake --add-missing --copy -Wportability -Woverride || bail_out
 
 # --- Step 5: Generate configure and include/miaconfig.h from:
 #             . configure.ac
diff --git a/java/Makefile.am b/java/Makefile.am
index af3b1885c3..982bd81f51 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -64,7 +64,7 @@ uninstall:
 	rm -f $(scrollview_path)/*.jar
 endif
 
-clean :
+clean-local:
 	rm -f ScrollView.jar $(SCROLLVIEW_CLASSES)
 
 # all-am does nothing, to make the java part optional.