diff --git a/cf/Makefile.am.common b/cf/Makefile.am.common
index 1c68c1126..698c73adc 100644
--- a/cf/Makefile.am.common
+++ b/cf/Makefile.am.common
@@ -1,12 +1,14 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = foreign no-dependencies 1.4b
+AUTOMAKE_OPTIONS = foreign no-dependencies 1.6
 
 SUFFIXES = .et .h
 
 INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
 
+if do_roken_rename
 ROKEN_RENAME = -DROKEN_RENAME
+endif
 
 AM_CFLAGS = $(WFLAGS)