diff --git a/plinth/modules/infinoted/__init__.py b/plinth/modules/infinoted/__init__.py
index 71415355d..0ed0b254b 100644
--- a/plinth/modules/infinoted/__init__.py
+++ b/plinth/modules/infinoted/__init__.py
@@ -41,7 +41,7 @@ managed_services = ['infinoted']
 
 managed_packages = ['infinoted']
 
-title = _('Gobby Server (infinoted)')
+title = _('Gobby Server \n (infinoted)')
 
 description = [
     _('infinoted is a server for Gobby, a collaborative text editor.'),
diff --git a/setup.py b/setup.py
index fb51042ee..573327568 100755
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ Plinth setup file
 
 from distutils import log
 from distutils.command.build import build
-from distutils.dir_util import remove_tree
+from distutils.dir_util import remove_tree,copy_tree
 from distutils.command.clean import clean
 from distutils.command.install_data import install_data
 from distutils.core import Command
@@ -44,8 +44,8 @@ DIRECTORIES_TO_CREATE = [
 ]
 
 DIRECTORIES_TO_COPY = [
-    ('/usr/share/plinth/static', 'static'),
     ('/usr/share/doc/plinth', 'doc'),
+    ('/usr/share/plinth/static', 'static'),
 ]
 
 LOCALE_PATHS = [
@@ -143,15 +143,16 @@ class CustomInstallData(install_data):
 
         # Recursively overwrite directories
         for target, source in DIRECTORIES_TO_COPY:
-
-            remove_tree(target)
             
             if self.root:
                 target = change_root(self.root, target)
 
-            if not os.path.exists(target):
-                log.info("recursive copy '%s' to '%s'", source, target)
-                shutil.copytree(source, target, symlinks=True)
+            
+            if os.path.exists(target):
+               remove_tree(target)
+
+            log.info("recursive copy '%s' to '%s'", source, target)
+            shutil.copytree(source, target,symlinks=True)
 
 
 find_packages = setuptools.PEP420PackageFinder.find