diff --git a/.gitattributes b/.gitattributes
index b8424c26a7..f68ee0ec6e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3623,6 +3623,7 @@ packager/globallinks/lazcustomform-0.lpl svneol=native#text/plain
 packager/globallinks/lazdaemon-0.lpl svneol=native#text/plain
 packager/globallinks/lazdatadict-0.lpl svneol=native#text/plain
 packager/globallinks/lazdbexport-0.lpl svneol=native#text/plain
+packager/globallinks/lazmouseandkeyinput-0.lpl svneol=native#text/plain
 packager/globallinks/lazopenglcontext-0.lpl svneol=native#text/plain
 packager/globallinks/lazparadox-0.lpl svneol=native#text/plain
 packager/globallinks/lazreport-0.9.5.lpl svneol=native#text/plain
diff --git a/packager/globallinks/lazmouseandkeyinput-0.lpl b/packager/globallinks/lazmouseandkeyinput-0.lpl
new file mode 100644
index 0000000000..bf8c1d1572
--- /dev/null
+++ b/packager/globallinks/lazmouseandkeyinput-0.lpl
@@ -0,0 +1 @@
+$(LazarusDir)/components/mouseandkeyinput/lazmouseandkeyinput.lpk
diff --git a/tools/find_missing_lpl_files.sh b/tools/find_missing_lpl_files.sh
index cb894e4be8..01eaada4a8 100755
--- a/tools/find_missing_lpl_files.sh
+++ b/tools/find_missing_lpl_files.sh
@@ -5,12 +5,22 @@
 
 set -e
 
-LazDir=..
+if [ ! -e tools ]; then
+  echo "please cd to lazarus source directory before running this script"
+  exit
+fi
 
-LPKFiles=$(find $LazDir -name '*.lpk' | xargs)
+LPKFiles=$(find . -name '*.lpk' | xargs)
 for LPK in $LPKFiles; do
   LPKName=$(echo $LPK | sed -e 's/.*\///' -e 's/.lpk//')
-  ls $LazDir/packager/globallinks/${LPKName}-*.lpl 2>/dev/null > /dev/null || echo missing lpl for $LPK
+  Missing=
+  ls packager/globallinks/${LPKName}-*.lpl >/dev/null 2>/dev/null || Missing=1
+  if [ -n "$Missing" ]; then
+    echo missing lpl for $LPK
+    LPK=$(echo $LPK | sed -e 's/^\.\///')
+    LPLFilename=packager/globallinks/$LPKName-0.lpl
+    echo '$(LazarusDir)/'$LPK > $LPLFilename
+  fi
 done
 
 #end.