2 files changed, 4 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 7a9eae1e..bf7a6db8 100644
--- a/Makefile
+++ b/Makefile
@@ -166,9 +166,9 @@ write_sysconfig:
            echo 'rocks_trees = {' >> "$(DESTDIR)$(CONFIG_FILE)" ;\
            if  [ ! -n "$(FORCE_CONFIG)" ] ;\
            then \
-              echo '   home..[[/.luarocks]],' >> "$(DESTDIR)$(CONFIG_FILE)" ;\
+              echo '   { name = [[user]], root = home..[[/.luarocks]] },' >> "$(DESTDIR)$(CONFIG_FILE)" ;\
            fi ;\
-           echo '   [[$(ROCKS_TREE)]]' >> "$(DESTDIR)$(CONFIG_FILE)" ;\
+           echo '   { name = [[system]], root = [[$(ROCKS_TREE)]] }' >> "$(DESTDIR)$(CONFIG_FILE)" ;\
            echo '}' >> "$(DESTDIR)$(CONFIG_FILE)" ;\
         fi
 
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index f66ad1d9..3a5294f5 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -168,10 +168,10 @@ end
 
 if not next(rocks_trees) then
    if home_tree then
-      table.insert(rocks_trees, home_tree)
+      table.insert(rocks_trees, { name = "user", root = home_tree } )
    end
    if site_config.LUAROCKS_ROCKS_TREE then
-      table.insert(rocks_trees, site_config.LUAROCKS_ROCKS_TREE)
+      table.insert(rocks_trees, { name = "system", root = site_config.LUAROCKS_ROCKS_TREE } )
    end
 end