Index: kernel/setup/steps/ezstep_site_types.php
===================================================================
--- kernel/setup/steps/ezstep_site_types.php	(revision 22640)
+++ kernel/setup/steps/ezstep_site_types.php	(working copy)
@@ -44,7 +44,17 @@
     function eZStepSiteTypes( $tpl, $http, $ini, &$persistenceList )
     {
         $ini = eZINI::instance( 'package.ini' );
-        $this->IndexURL = $ini->variable( 'RepositorySettings', 'RemotePackagesIndexURL' );
+        $indexURL = trim( $ini->variable( 'RepositorySettings', 'RemotePackagesIndexURL' ) );
+        if ( $indexURL === '' )
+        {
+            $indexURL = trim( $ini->variable( 'RepositorySettings', 'RemotePackagesIndexURLBase' ) );
+            if ( substr( $indexURL, -1, 1 ) !== '/' )
+            {
+                $indexURL .= '/';
+            }
+            $indexURL .= eZPublishSDK::version( false, false, false ) . '/' . eZPublishSDK::version() . '/';
+        }
+        $this->IndexURL = $indexURL;
 
         if ( substr( $this->IndexURL, -1, 1 ) == '/' )
             $this->XMLIndexURL = $this->IndexURL . 'index.xml';
Index: settings/package.ini
===================================================================
--- settings/package.ini	(revision 22640)
+++ settings/package.ini	(working copy)
@@ -15,7 +15,11 @@
 # If you want to use the old packages which were available in
 # versions prior to 3.9 use the following URL instead:
 # http://packages.ez.no/ezpublish/3.9legacypackages
-RemotePackagesIndexURL=http://packages.ez.no/ezpublish/4.0/4.0.0
+RemotePackagesIndexURL=
+# If RemotePackagesIndexURL is empty, the RemotePackagesIndexURLBase setting
+# will be used, appended with the eZ Publish version numbers, like
+# RemotePackagesIndexURLBase/x.y/x.y.zalpha1
+RemotePackagesIndexURLBase=http://packages.ez.no/ezpublish
 
 [PackageSettings]
 RepositoryDirectories[]=kernel/classes