diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 6fa378dd88a9b..52d111e834ae3 100644
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-31  Jackson Harper  <jackson@ximian.com>
+
+	* ScrollBar.cs: Cap values when incrementing/decrementing.
+
 2006-03-31  Mike Kestner  <mkestner@novell.com>
 
 	* MenuAPI.cs: setup menu.tracker for popup/context menus.
@@ -59,6 +63,10 @@
 
 	* MenuItem.cs: only emit DrawItem and MeasureItem for OwnerDraw.
 
+2006-03-29  Jackson Harper  <jackson@ximian.com>
+
+	* Form.cs: Implement TODO.
+
 2006-03-29  Peter Dennis Bartok  <pbartok@novell.com> 
 
 	* PrintPreviewDialog.cs: Implemented missing methods and events; still
@@ -86,6 +94,7 @@
 	  - Making sure the active control is selected when the control is created
 	* CurrencyManager.cs: Removed obsolete TODO
 
+>>>>>>> .r58862
 2006-03-29  Mike Kestner  <mkestner@novell.com>
 
 	* *.cs: fix remaining corcompare issues for 1.1 API with the exception
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ScrollBar.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ScrollBar.cs
index 0c62db184872b..1766d508bef2b 100644
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ScrollBar.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ScrollBar.cs
@@ -570,7 +570,7 @@ private void CalcThumbArea ()
 		private void LargeIncrement ()
     		{			
 			ScrollEventArgs event_args;
-    			int pos = position + large_change;
+    			int pos = Math.Min (Maximum, position + large_change);
 
     			event_args = new ScrollEventArgs (ScrollEventType.LargeIncrement, pos);
     			OnScroll (event_args);    			
@@ -584,7 +584,7 @@ private void LargeIncrement ()
     		private void LargeDecrement ()
     		{			
 			ScrollEventArgs event_args;
-    			int pos = position - large_change;
+    			int pos = Math.Max (Minimum, position - large_change);
     			
     			event_args = new ScrollEventArgs (ScrollEventType.LargeDecrement, pos);
     			OnScroll (event_args);
@@ -1029,7 +1029,7 @@ private void SetHomePosition ()
     		private void SmallIncrement ()
     		{
     			ScrollEventArgs event_args;
-    			int pos = position + small_change;
+    			int pos = Math.Min (Maximum, position + small_change);
     			
     			event_args = new ScrollEventArgs (ScrollEventType.SmallIncrement, pos);
     			OnScroll (event_args);    			
@@ -1043,8 +1043,8 @@ private void SmallIncrement ()
     		private void SmallDecrement ()
     		{			
 			ScrollEventArgs event_args;
-    			int pos = position - small_change;
-    			
+    			int pos = Math.Max (Minimum, position - small_change);
+
     			event_args = new ScrollEventArgs (ScrollEventType.SmallDecrement, pos);
     			OnScroll (event_args);
     			Value = event_args.NewValue;