diff --git a/build/Makefile.am.changelog b/build/Makefile.am.changelog
index 861e53180..07e603695 100644
--- a/build/Makefile.am.changelog
+++ b/build/Makefile.am.changelog
@@ -54,7 +54,7 @@ DISTCLEANFILES += ChangeLog.cache-*
 
 ChangeLog.cache-*..: .git
 
-#ChangeLog%: $(srcdir)/ChangeLog%
+ChangeLog%: $(srcdir)/ChangeLog%
 
 $(srcdir)/ChangeLog.cache-% $(srcdir)/ChangeLog.pre-%:
 	@echo Creating $@
diff --git a/configure.ac b/configure.ac
index 0782baf24..f659729d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,8 +9,7 @@ AC_GNU_SOURCE
 AC_USE_SYSTEM_EXTENSIONS
 AC_CONFIG_SRCDIR(src/cairo.h)
 AC_CONFIG_HEADERS(config.h)
-#AM_INIT_AUTOMAKE([1.9.6 gnu -Wall no-define])
-AM_INIT_AUTOMAKE([1.9.6])
+AM_INIT_AUTOMAKE([1.9.6 gnu -Wall no-define])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_LIBTOOL_WIN32_DLL dnl Must be called before AC_PROG_LIBTOOL
 AC_PROG_LIBTOOL dnl ([1.4]) Don't remove!
diff --git a/perf/Makefile.am b/perf/Makefile.am
index f3eb734f7..d41891f6c 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -43,13 +43,12 @@ libcairoperf_la_SOURCES = \
 	$(libcairoperf_headers)
 libcairoperf_la_LIBADD = $(CAIROPERF_LIBS)
 
-cairo_perf_trace_SOURCES = a.cpp \
+cairo_perf_trace_SOURCES = \
 	$(cairo_perf_trace_sources)	\
 	$(cairo_perf_trace_external_sources)
 cairo_perf_trace_LDADD =		\
 	$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
-	$(LDADD) $(CAIRO_LIBS)
-skia = -Wl,--start-group @skia_DIR@/out/Debug/obj.target/gyp/libeffects.a @skia_DIR@/out/Debug/obj.target/gyp/libimages.a @skia_DIR@/out/Debug/obj.target/gyp/libutils.a @skia_DIR@/out/Debug/obj.target/gyp/libopts.a @skia_DIR@/out/Debug/obj.target/gyp/libcore.a -Wl,--end-group
+	$(LDADD)
 cairo_perf_trace_DEPENDENCIES = \
 	$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
 	$(LDADD)