diff --git a/bin/leanpkg b/bin/leanpkg
index 755d8de867..929bbf706d 100755
--- a/bin/leanpkg
+++ b/bin/leanpkg
@@ -9,6 +9,9 @@ fi
 leandir=$(dirname $($READLINK -f $0))/..
 leandir=$($READLINK -f $leandir)
 
-LEAN_PATH=$leandir/library:$leandir/lib/lean/library:$leandir/leanpkg \
+librarydir="$leandir/lib/lean"
+test -d "$librarydir" || librarydir="$leandir"
+
+LEAN_PATH=$librarydir/library:$librarydir/leanpkg \
   PATH=$leandir/bin:$PATH \
-  exec lean --run $leandir/leanpkg/leanpkg/main.lean "$@"
+  exec lean --run $librarydir/leanpkg/leanpkg/main.lean "$@"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a7a9792bae..2685edd833 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -495,7 +495,14 @@ install(DIRECTORY "${CMAKE_SOURCE_DIR}/../library" DESTINATION "${LIBRARY_DIR}"
         FILES_MATCHING
         PATTERN "*.lean"
         PATTERN "*.olean"
-        PATTERN ".project"
+        PATTERN "leanpkg.toml"
+        PATTERN "*.md")
+
+install(DIRECTORY "${CMAKE_SOURCE_DIR}/../leanpkg" DESTINATION "${LIBRARY_DIR}"
+        FILES_MATCHING
+        PATTERN "*.lean"
+        PATTERN "*.olean"
+        PATTERN "leanpkg.toml"
         PATTERN "*.md")
 
 install(DIRECTORY "${CMAKE_SOURCE_DIR}/" DESTINATION "${LEAN_EXT_INCLUDE_DIR}"