diff --git a/pkgs/distro-build/install-for-docs.rkt b/pkgs/distro-build/install-for-docs.rkt
index adcd10d..09d2568 100644
--- a/pkgs/distro-build/install-for-docs.rkt
+++ b/pkgs/distro-build/install-for-docs.rkt
@@ -28,9 +28,10 @@
 (define ht
   (hash 'doc-dir (build-path/s "doc")
         'lib-dir (build-path/s "lib")
+        'share-dir (build-path/s "share")
         'dll-dir (build-path/s "lib")
-        'links-file (build-path/s "lib" "links.rktd")
-        'pkgs-dir (build-path/s "lib" "pkgs")
+        'links-file (build-path/s "share" "links.rktd")
+        'pkgs-dir (build-path/s "share" "pkgs")
         'bin-dir (build-path/s "bin")
         'include-dir (build-path/s "include")
         'catalogs (map build-path/f catalogs)))
diff --git a/pkgs/distro-build/installer-exe.rkt b/pkgs/distro-build/installer-exe.rkt
index eb960d2..53f3356 100644
--- a/pkgs/distro-build/installer-exe.rkt
+++ b/pkgs/distro-build/installer-exe.rkt
@@ -212,7 +212,6 @@ Function myTestInstDir
   IfFileExists "$INSTDIR\Racket.exe" racket_is_installed
   @(if auto-launch @~a{IfFileExists "$INSTDIR\${RKTLaunchProgram}.exe" racket_is_installed} "")
   IfFileExists "$INSTDIR\collects"     racket_is_installed
-  IfFileExists "$INSTDIR\lib\collects" racket_is_installed
   Goto racket_is_not_installed
   racket_is_installed:
     IfFileExists "${UNINSTEXE}" we_have_uninstall
@@ -320,7 +319,7 @@ Function un.myGUIInit
   IfFileExists "$INSTDIR\Racket.exe"   racket_is_installed_un
   IfFileExists "$INSTDIR\lib\GRacket.exe"  racket_is_installed_un
   @(if auto-launch @~a{IfFileExists "$INSTDIR\${RKTLaunchProgram}.exe" racket_is_installed_un} "")
-  IfFileExists "$INSTDIR\lib\collects" racket_is_installed_un
+  IfFileExists "$INSTDIR\collects" racket_is_installed_un
     MessageBox MB_YESNO "It does not appear that Racket is installed in '$INSTDIR'.$\r$\nContinue anyway (not recommended)?" /SD IDYES IDYES racket_is_installed_un
     Abort "Uninstall aborted by user"
   racket_is_installed_un:
@@ -336,6 +335,7 @@ Section "Uninstall"
     Delete "$INSTDIR\README*.*"
     RMDir /r "$INSTDIR\include"
     RMDir /r "$INSTDIR\lib"
+    RMDir /r "$INSTDIR\share"
     RMDir /r "$INSTDIR\etc"
     RMDir /r "$INSTDIR\doc"
     ;; these exist in Racket-Full installations
diff --git a/pkgs/distro-build/pack-collects.rkt b/pkgs/distro-build/pack-collects.rkt
index 272061e..6078a4f 100644
--- a/pkgs/distro-build/pack-collects.rkt
+++ b/pkgs/distro-build/pack-collects.rkt
@@ -13,7 +13,5 @@
 (when (file-exists? tgz-file)
   (delete-file tgz-file))
 
-(parameterize ([current-directory (build-path "racket/lib")])
+(parameterize ([current-directory (build-path "racket")])
   (tar-gzip tgz-file "collects"))
-
-     
\ No newline at end of file
diff --git a/pkgs/distro-build/readme.rkt b/pkgs/distro-build/readme.rkt
index 72b0a37..a5b2bfe 100644
--- a/pkgs/distro-build/readme.rkt
+++ b/pkgs/distro-build/readme.rkt
@@ -30,7 +30,7 @@
       also modify Racket; if you distribute a modified version, you must
       distribute it under the terms of the LGPL, which in particular means
       that you must release the source code for the modified software.  See
-      lib/COPYING_LESSER.txt for more information.})
+      share/COPYING_LESSER.txt for more information.})
 
 (define macosx-notes
   @~a{Install by dragging the enclosing Racket folder to your Applications folder
diff --git a/pkgs/distro-build/unix-installer/installer-header b/pkgs/distro-build/unix-installer/installer-header
index 8c685f6..44dc68f 100644
--- a/pkgs/distro-build/unix-installer/installer-header
+++ b/pkgs/distro-build/unix-installer/installer-header
@@ -164,6 +164,7 @@ set_dirs() {
   libdir="$1/lib"
   incrktdir="$1/include/$TARGET"
   librktdir="$1/lib/$TARGET"
+  sharerktdir="$1/share/$TARGET"
   configdir="$1/etc/$TARGET"
   has_share="N"
   if test -d "$1/share"; then has_share="Y"; fi
@@ -227,8 +228,8 @@ unpack_installation() {
     | { cd "$INSTDIR"
         "$tar" xf - || failwith "problems during unpacking of binary archive."
       }
-  test -d "$INSTDIR/lib/collects" \
-    || failwith "unpack failed (could not find \"$T/lib/collects\")."
+  test -d "$INSTDIR/collects" \
+    || failwith "unpack failed (could not find \"$T/collects\")."
   echo "Done."
 }
 
@@ -328,6 +329,7 @@ unixstyle_install() {
       echo "Target Directories:"
       show_dir_var "[e] Executables  " "$bindir"
       show_dir_var "[o] Libraries    " "$librktdir"
+      show_dir_var "[s] Shared files " "$sharerktdir"
       show_dir_var "[c] Configuration" "$configdir"
       show_dir_var "[d] Documentation" "$docdir"
       show_dir_var "[l] C Libraries  " "$libdir"
@@ -351,6 +353,7 @@ unixstyle_install() {
       [lL]* ) read_dir libdir ;;
       [hH]* ) read_dir incrktdir ;;
       [oO]* ) read_dir librktdir ;;
+      [sS]* ) read_dir sharerktdir ;;
       [cC]* ) read_dir configdir ;;
       [mM]* ) read_dir mandir ;;
       ""    ) if test "$err" = "N"; then done="Y"
@@ -382,9 +385,9 @@ unixstyle_install() {
   unpack_installation "$tmp"
 
   cd "$where"
-  "$tmp/bin/racket" "$tmp/lib/collects/setup/unixstyle-install.rkt" \
-    "move" "$tmp" "$bindir" "$librktdir/collects" "$docdir" "$libdir" \
-    "$incrktdir" "$librktdir" "$configdir" "$mandir" \
+  "$tmp/bin/racket" "$tmp/collects/setup/unixstyle-install.rkt" \
+    "move" "$tmp" "$bindir" "$sharerktdir/collects" "$docdir" "$libdir" \
+    "$incrktdir" "$librktdir" "$sharerktdir" "$configdir" "$mandir" \
     || failwith "installation failed"
 
 }
diff --git a/pkgs/distro-build/unpack-collects.rkt b/pkgs/distro-build/unpack-collects.rkt
index 4837b07..bc9dbd4 100644
--- a/pkgs/distro-build/unpack-collects.rkt
+++ b/pkgs/distro-build/unpack-collects.rkt
@@ -22,12 +22,9 @@
 
 (display-time)
 
-(define lib-dir (build-path dest-dir "lib"))
-(make-directory* lib-dir)
-
-(define collects-dir (build-path lib-dir "collects"))
+(define collects-dir (build-path dest-dir "collects"))
 (when (directory-exists? collects-dir)
   (delete-directory/files collects-dir))
 
 (untgz (open-input-bytes zip-content)
-       #:dest lib-dir)
+       #:dest dest-dir)