diff --git a/freeipa.spec.in b/freeipa.spec.in
index 7dc576256..09dd66eec 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -705,6 +705,7 @@ fi
 %dir %{python_sitelib}/ipaserver
 %dir %{python_sitelib}/ipaserver/install
 %dir %{python_sitelib}/ipaserver/install/plugins
+%dir %{python_sitelib}/ipaserver/install/server
 %dir %{python_sitelib}/ipaserver/advise
 %dir %{python_sitelib}/ipaserver/advise/plugins
 %dir %{python_sitelib}/ipaserver/plugins
diff --git a/ipaserver/install/server/__init__.py b/ipaserver/install/server/__init__.py
new file mode 100644
index 000000000..82b551fcb
--- /dev/null
+++ b/ipaserver/install/server/__init__.py
@@ -0,0 +1,5 @@
+#
+# Copyright (C) 2015  FreeIPA Contributors see COPYING for license
+#
+
+from .upgrade import upgrade_configuration
diff --git a/ipaserver/install/server.py b/ipaserver/install/server/upgrade.py
similarity index 100%
rename from ipaserver/install/server.py
rename to ipaserver/install/server/upgrade.py
diff --git a/setup.py b/setup.py
index af7964d60..434aeb8cc 100755
--- a/setup.py
+++ b/setup.py
@@ -84,6 +84,7 @@ setup(
         'ipaserver.plugins',
         'ipaserver.install',
         'ipaserver.install.plugins',
+        'ipaserver.install.server',
     ],
     scripts=['ipa'],
     data_files = [('share/man/man1', ["ipa.1"])],