diff --git a/lib/alchemy/seeder.rb b/lib/alchemy/seeder.rb
index <HASH>..<HASH> 100644
--- a/lib/alchemy/seeder.rb
+++ b/lib/alchemy/seeder.rb
@@ -78,8 +78,8 @@ module Alchemy
       def create_default_site
         desc "Creating default site"
         site = Alchemy::Site.find_or_initialize_by_host(
-          :name => 'Default',
-          :host => 'default'
+          :name => 'Default Site',
+          :host => '*'
         )
         if site.new_record?
           site.save!
diff --git a/lib/alchemy/upgrader.rb b/lib/alchemy/upgrader.rb
index <HASH>..<HASH> 100644
--- a/lib/alchemy/upgrader.rb
+++ b/lib/alchemy/upgrader.rb
@@ -20,12 +20,26 @@ module Alchemy
         copy_new_config_file
         removed_richmedia_essences_notice
         convert_picture_storage
+        upgrade_to_sites
 
         display_todos
       end
 
     private
 
+      def upgrade_to_sites
+        desc "Creating default site and migrating existing languages to it"
+        if Site.count == 0
+          Alchemy::Site.transaction do
+            site = Alchemy::Site.create!(host: '*', name: 'Default Site')
+            Alchemy::Language.update_all(site_id: site.id)
+            log "Done."
+          end
+        else
+          log "Site(s) already present.", :skip
+        end
+      end
+
       # Creates Language model if it does not exist (Alchemy CMS prior v1.5)
       # Also creates missing associations between pages and languages
       def upgrade_to_language
Add creation of default site to alchemy:upgrade task.