diff --git a/kivy/config.py b/kivy/config.py
index c198f0376..6530ee358 100644
--- a/kivy/config.py
+++ b/kivy/config.py
@@ -184,7 +184,7 @@ from kivy.logger import Logger, logger_config_update
 from kivy.utils import OrderedDict
 
 # Version number of current configuration format
-KIVY_CONFIG_VERSION = 6
+KIVY_CONFIG_VERSION = 7
 
 #: Kivy configuration object
 Config = None
@@ -401,8 +401,6 @@ if not environ.get('KIVY_DOC_INCLUDE'):
             Config.setdefault('widgets', 'scroll_timeout', '55')
             Config.setdefault('widgets', 'scroll_distance', '20')
             Config.setdefault('widgets', 'scroll_friction', '1.')
-            Config.setdefault('widgets', 'scroll_stoptime', '300')
-            Config.setdefault('widgets', 'scroll_moves', '5')
 
             # remove old list_* token
             Config.remove_option('widgets', 'list_friction')
@@ -420,6 +418,13 @@ if not environ.get('KIVY_DOC_INCLUDE'):
         elif version == 5:
             Config.setdefault('graphics', 'resizable', '1')
 
+        elif version == 6:
+            # if the timeout is still the default value, change it
+            if Config.getint('widgets', 'scroll_timeout') == 250:
+                Config.set('widgets', 'scroll_timeout', '55')
+            Config.setdefault('widgets', 'scroll_stoptime', '300')
+            Config.setdefault('widgets', 'scroll_moves', '5')
+
         #elif version == 1:
         #   # add here the command for upgrading from configuration 0 to 1
         #
diff --git a/kivy/uix/scrollview.py b/kivy/uix/scrollview.py
index 0c6c9ba9c..c6194fb4f 100644
--- a/kivy/uix/scrollview.py
+++ b/kivy/uix/scrollview.py
@@ -493,6 +493,8 @@ class ScrollView(StencilView):
 
     :data:`scroll_moves` is a :class:`~kivy.properties.NumericProperty`,
     default to 5.
+
+    .. versionadded:: 1.5.0
     '''
 
     scroll_stoptime = NumericProperty(_scroll_stoptime)
@@ -501,9 +503,11 @@ class ScrollView(StencilView):
     start.
     This is to prevent autoscroll to trigger while the user has slowed down
     on purpose to prevent this.
-    
+
     :data:`scroll_stoptime` is a :class:`~kivy.properties.NumericProperty`,
     default to 300 (milliseconds)
+
+    .. versionadded:: 1.5.0
     '''
 
     scroll_distance = NumericProperty(_scroll_distance)
@@ -526,6 +530,9 @@ class ScrollView(StencilView):
     :data:`scroll_timeout` is a :class:`~kivy.properties.NumericProperty`,
     default to 55 (milliseconds), according to the default value in user
     configuration.
+
+    .. versionchanged:: 1.5.0
+        Default value changed from 250 to 55.
     '''
 
     scroll_x = NumericProperty(0.)