diff --git a/ChangeLog b/ChangeLog
index fad1c7efff..cf40036ab1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-01  Derek Atkins  <derek@ihtfp.com>
+
+	* configure.in: Don't need to patch libtool for darwin anymore.
+	  Patch by David Reiser.
+	* src/gnome-utils/dialog-preferences.c: fix non-C99 construct so
+	  the file builds again.
+
 2006-06-01  Andreas Köhler  <andi5.py@gmx.net>
 
 	* src/gnome-utils/dialog-preferences.c: Do not try to find
diff --git a/configure.in b/configure.in
index 546df5022b..3882ff121c 100644
--- a/configure.in
+++ b/configure.in
@@ -213,14 +213,15 @@ case $host_os in
 update to latest  darwin])
 		;;
 	darwin*)
-                AC_CHECK_HEADERS(popt.h)
-		AC_MSG_RESULT([yes, patching libtool to always build dylibs])
-		mv libtool libtool.old
-		${SED} -e 's/^deplibs_check_method.*/deplibs_check_method=pass_all/g' \
-			-e 's|^library_names_spec.*|library_names_spec="\\$libname\\$release\\$versuffix.dylib \\$libname\\$release\\${major}.dylib \\$libname.dylib"|g' \
-			-e 's|^soname_spec.*|soname_spec="\\$libname\\$release\\$major.dylib"|g' \
-			< libtool.old > libtool
-		rm libtool.old
+		AC_MSG_RESULT([yes, moving on...])
+#		AC_CHECK_HEADERS(popt.h)
+#		AC_MSG_RESULT([yes, patching libtool to always build dylibs])
+#		mv libtool libtool.old
+#		${SED} -e 's/^deplibs_check_method.*/deplibs_check_method=pass_all/g' \
+#			-e 's|^library_names_spec.*|library_names_spec="\\$libname\\$release\\$versuffix.dylib \\$libname\\$release\\${major}.dylib \\$libname.dylib"|g' \
+#			-e 's|^soname_spec.*|soname_spec="\\$libname\\$release\\$major.dylib"|g' \
+#			< libtool.old > libtool
+#		rm libtool.old
 		;;
 	*)
 		AC_MSG_RESULT(no)
diff --git a/src/gnome-utils/dialog-preferences.c b/src/gnome-utils/dialog-preferences.c
index 3b9efb0f26..8bdb3a32eb 100644
--- a/src/gnome-utils/dialog-preferences.c
+++ b/src/gnome-utils/dialog-preferences.c
@@ -335,7 +335,7 @@ struct copy_data {
 static GtkWidget *
 gnc_prefs_find_page (GtkNotebook *notebook, const gchar *name)
 {
-  int n_pages;
+  int n_pages, i;
   GtkWidget *child;
   const gchar *child_name;
 
@@ -346,7 +346,7 @@ gnc_prefs_find_page (GtkNotebook *notebook, const gchar *name)
 
   n_pages = gtk_notebook_get_n_pages (notebook);
 
-  for (int i=0; i<n_pages; i++) {
+  for (i=0; i<n_pages; i++) {
     child = gtk_notebook_get_nth_page (notebook, i);
     g_return_val_if_fail (child, NULL);