diff --git a/ChangeLog b/ChangeLog
index a09d962445996cd65fa4f5beced1e5a79db8b959..40fec1d93da10a59b7914a31b825954fd7536b84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-31	Benedikt Meurer <benny@xfce.org>
+
+	* thunar/thunar-standard-view.c(thunar_standard_view_scroll_event): Add
+	  support to zoom in/out using Control+MouseWheel.
+
 2006-01-30	Benedikt Meurer <benny@xfce.org>
 
 	* thunar/thunar-window.c(thunar_window_action_open_templates): Improve
diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index 375a4579e82d1173ab3d2268906ab977acea4668..0e498f677d0c76c0fd05361edd1814b29cd8ad92 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -2123,6 +2123,16 @@ thunar_standard_view_scroll_event (GtkWidget          *view,
         }
     }
 
+  /* zoom-in/zoom-out on control+mouse wheel */
+  if ((event->state & GDK_CONTROL_MASK) != 0 && (event->direction == GDK_SCROLL_UP || event->direction == GDK_SCROLL_DOWN))
+    {
+      thunar_view_set_zoom_level (THUNAR_VIEW (standard_view),
+          (event->direction == GDK_SCROLL_UP)
+          ? MIN (standard_view->priv->zoom_level + 1, THUNAR_ZOOM_N_LEVELS - 1)
+          : MAX (standard_view->priv->zoom_level, 1) - 1);
+      return TRUE;
+    }
+
   /* next please... */
   return FALSE;
 }