diff --git a/src/modules/postcfg/main.py b/src/modules/postcfg/main.py
index 4659ac545..3660e2171 100644
--- a/src/modules/postcfg/main.py
+++ b/src/modules/postcfg/main.py
@@ -3,7 +3,7 @@
 #
 # === This file is part of Calamares - <http://github.com/calamares> ===
 #
-#   Copyright 2014 - 2016, Philip Müller <philm@manjaro.org>
+#   Copyright 2014 - 2018, Philip Müller <philm@manjaro.org>
 #   Copyright 2016, Artoo <artoo@manjaro.org>
 #
 #   Calamares is free software: you can redistribute it and/or modify
@@ -65,9 +65,6 @@ class ConfigController:
         self.init_keyring()
         self.populate_keyring()
 
-        # Remove calamares
-        self.remove_pkg("calamares", "usr/bin/calamares")
-
         # Generate mirror list
         if exists(join(self.root, "usr/bin/pacman-mirrors")):
             if libcalamares.globalstorage.value("hasInternet"):
@@ -75,6 +72,13 @@ class ConfigController:
         else:
             self.copy_file('etc/pacman.d/mirrorlist')
 
+        # Initialize package manager databases
+        if libcalamares.globalstorage.value("hasInternet"):
+            target_env_call(["pacman", "-Syy"])
+
+        # Remove calamares
+        self.remove_pkg("calamares", "usr/bin/calamares")
+
         # Copy skel to root
         self.copy_folder('etc/skel', 'root')