diff --git a/ChangeLog b/ChangeLog
index 46a45c33b..ab859c90f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-04-12  Carl Worth  <cworth@cworth.org>
+
+	* src/cairo-pattern.c:
+	* src/cairo-surface.c: (_cairo_surface_init): Default to
+	CAIRO_FILTER_GOOD rather than CAIRO_FILTER_BEST.
+
+	* src/cairo-pattern.c:
+	(_cairo_pattern_acquire_surface_for_surface): Optimize to use
+	CAIRO_FILTER_NEAREST when the pattern matrix is an integer
+	translation.
+
 2005-04-12  Carl Worth  <cworth@cworth.org>
 
 	* src/cairo-pattern.c:
diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
index 177105f64..c0aa6fff8 100644
--- a/src/cairo-pattern.c
+++ b/src/cairo-pattern.c
@@ -1076,7 +1076,7 @@ _cairo_pattern_acquire_surface_for_surface (cairo_surface_pattern_t   *pattern,
 	attr->x_offset = -x;
 	attr->y_offset = -y;
 	attr->extend   = CAIRO_EXTEND_NONE;
-	attr->filter   = CAIRO_FILTER_BEST;
+	attr->filter   = CAIRO_FILTER_GOOD;
 	
 	cairo_matrix_init_identity (&attr->matrix);
     }
@@ -1107,6 +1107,7 @@ _cairo_pattern_acquire_surface_for_surface (cairo_surface_pattern_t   *pattern,
 	    cairo_matrix_init_identity (&attr->matrix);
 	    attr->x_offset = tx;
 	    attr->y_offset = ty;
+	    attr->filter = CAIRO_FILTER_NEAREST;
 	}
 	else
 	{
diff --git a/src/cairo-surface.c b/src/cairo-surface.c
index 6f65c86df..3bc206933 100644
--- a/src/cairo-surface.c
+++ b/src/cairo-surface.c
@@ -50,7 +50,7 @@ _cairo_surface_init (cairo_surface_t			*surface,
     _cairo_user_data_array_init (&surface->user_data);
 
     cairo_matrix_init_identity (&surface->matrix);
-    surface->filter = CAIRO_FILTER_BEST;
+    surface->filter = CAIRO_FILTER_GOOD;
     surface->repeat = 0;
 
     surface->device_x_offset = 0;