diff --git a/.gitignore b/.gitignore
index b16e2bcc..7963ddf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,27 +9,16 @@ __pycache__
 *.res
 *.lrt
 /lazpaint/*.lrj
-
 lazpaint/backup/
-
 *.lrj
-
 vectoredit/vectoredit
-
 vectoredit/backup/
-
 lazpaint/test_embedded/backup/
-
 lazpaint/test_embedded/project1
-
 lazpaint/dialog/filter/backup/
-
 lazpaint/release/bin/lazpaint
-
 lazpaint/tools/backup/
-
 lazpaint/image/backup/
-
 lazpaint/dialog/backup/
 .DS_Store
 lazpaint/release/bin/lazpaint.app
@@ -39,7 +28,7 @@ lazpaint/release/windows/lazpaint64
 lazpaint/release/bin/i18n/lazpaint32.*
 lazpaint/release/bin/i18n/lazpaint_x64.*
 /lazpaint/dialog/color/backup
-
 resources/createresource/backup/
-
 lazpaint/units/
+/bgracontrols
+/bgrabitmap
diff --git a/Makefile b/Makefile
index f56ad89f..3bb05a96 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,9 @@
 # On FreeBSD, TARGET can be Gtk2 (default) or Qt5
 # On Windows, TARGET can be Win32 (default) or Qt5
 
+BGRABITMAP_DIR := bgrabitmap/bgrabitmap
+BGRACONTROLS_DIR := bgracontrols
+
 ifeq ($(OS),Windows_NT)     # true for Windows_NT or later
   SHELL := C:/Windows/System32/cmd.exe /c
   UNAME := Windows
@@ -81,7 +84,7 @@ endif
 
 # Lazarus custom packages explicitely compiled
 ifeq "$(FOREIGN_LPK)" "1"
-  FOREIGN_PACKAGES=bgrabitmap/bgrabitmappack.lpk bgracontrols/bgracontrols.lpk
+  FOREIGN_PACKAGES=$(BGRABITMAP_DIR)/bgrabitmappack.lpk $(BGRACONTROLS_DIR)/bgracontrols.lpk
 endif
 
 all: compile
@@ -95,8 +98,8 @@ ifeq ($(UNAME),Linux)
 	install -D "$(SOURCE_BIN_DIR)/$(package)" "$(BIN_DIR)/lazpaint"
 	for f in $(PO_FILES); do install -D --mode=0644 "$(SOURCE_BIN_DIR)/i18n/$$f" "$(RESOURCE_DIR)/i18n/$$f"; done
 	for f in $(MODEL_FILES); do install -D --mode=0644 "$(SOURCE_BIN_DIR)/models/$$f" "${RESOURCE_DIR}/models/$$f"; done
-	for f in $(SCRIPT_FILES); do install -D "$(SOURCE_SCRIPT_DIR)/$$f" "${RESOURCE_DIR}/scripts/$$f"; done
-	for f in $(SCRIPT_RUNTIME_FILES); do install -D "$(SOURCE_SCRIPT_DIR)/lazpaint/$$f" "${RESOURCE_DIR}/scripts/lazpaint/$$f"; done
+	for f in $(SCRIPT_FILES); do install -D --mode=0644 "$(SOURCE_SCRIPT_DIR)/$$f" "${RESOURCE_DIR}/scripts/$$f"; done
+	for f in $(SCRIPT_RUNTIME_FILES); do install -D --mode=0644 "$(SOURCE_SCRIPT_DIR)/lazpaint/$$f" "${RESOURCE_DIR}/scripts/lazpaint/$$f"; done
 	install -D "$(SOURCE_DEBIAN_UPSTREAM)/applications/lazpaint.desktop" "$(SHARE_DIR)/applications/lazpaint.desktop"
 	install -D "$(EXTRACTED_ICONS_DIR)/48x48.png" "$(SHARE_DIR)/pixmaps/lazpaint.png"
 	for s in $(EXTRACTED_ICONS); do install -D --mode=0644 "$(EXTRACTED_ICONS_DIR)/$$s.png" "$(ICON_DIR)/$$s/apps/lazpaint.png"; done
@@ -131,12 +134,12 @@ clean_icons:
 	$(REMOVEDIR) "icons"
 
 clean_bgrabitmap:
-	$(REMOVEDIR) "bgrabitmap/lib"
-	$(REMOVEDIR) "bgrabitmap/backup"
+	$(REMOVEDIR) "$(BGRABITMAP_DIR)/lib"
+	$(REMOVEDIR) "$(BGRABITMAP_DIR)/backup"
 
 clean_bgracontrols:
-	$(REMOVEDIR) "bgracontrols/lib"
-	$(REMOVEDIR) "bgracontrols/backup"
+	$(REMOVEDIR) "$(BGRACONTROLS_DIR)/lib"
+	$(REMOVEDIR) "$(BGRACONTROLS_DIR)/backup"
 
 clean_lazpaint:
 	$(REMOVEDIR) "lazpaintcontrols/lib"
@@ -144,13 +147,13 @@ clean_lazpaint:
 	$(REMOVEDIR) "lazpaint/release/lib"
 	$(REMOVE) "lazpaint/lazpaint.res"
 ifeq ($(UNAME),Windows)
-	$(REMOVE) "lazpaint/release/lazpaint.exe"
-	$(REMOVE) "lazpaint/release/lazpaint32.exe"
-	$(REMOVE) "lazpaint/release/lazpaint_x64.exe"
+	$(REMOVE) "lazpaint/release/bin/lazpaint.exe"
+	$(REMOVE) "lazpaint/release/bin/lazpaint32.exe"
+	$(REMOVE) "lazpaint/release/bin/lazpaint_x64.exe"
 else
-	$(REMOVE) "lazpaint/release/lazpaint"
-	$(REMOVE) "lazpaint/release/lazpaint-gtk2"
-	$(REMOVE) "lazpaint/release/lazpaint-qt5"
+	$(REMOVE) "lazpaint/release/bin/lazpaint"
+	$(REMOVE) "lazpaint/release/bin/lazpaint-gtk2"
+	$(REMOVE) "lazpaint/release/bin/lazpaint-qt5"
 endif
 	$(REMOVEDIR) "lazpaint/backup"
 	$(REMOVEDIR) "lazpaint/test_embedded/backup"
@@ -165,7 +168,7 @@ ifeq "$(lazdir)" ""
 else
 	$(COPY) "resources/lazpaint.res" "lazpaint/lazpaint.res"
 	$(CREATEDIR) "lazpaint/release/lib"
-	cd lazpaint $(THEN) $(fpcbin) -orelease/lazpaint -Fu./buttons -Fi./buttons -Fu./image -Fi./image -Fu./cursors -Fi./cursors -Fu./buttons -Fi./buttons -Fu./* -Fi./* -Fu../bgracontrols -Fi../bgracontrols -Fu../bgrabitmap -Fi../bgrabitmap $(LAZARUSDIRECTORIES) -MObjFPC -Scgi -Cg -OoREGVAR -Xs -XX -l -vewnhibq -O3 -CX -vi -FUrelease/lib/ -dLCL -d$(INTERFACE) lazpaint.lpr
+	cd lazpaint $(THEN) $(fpcbin) -orelease/lazpaint -Fu./buttons -Fi./buttons -Fu./image -Fi./image -Fu./cursors -Fi./cursors -Fu./buttons -Fi./buttons -Fu./* -Fi./* -Fu../$(BGRACONTROLS_DIR) -Fi../$(BGRACONTROLS_DIR) -Fu../$(BGRABITMAP_DIR) -Fi../$(BGRABITMAP_DIR) $(LAZARUSDIRECTORIES) -MObjFPC -Scgi -Cg -OoREGVAR -Xs -XX -l -vewnhibq -O3 -CX -vi -FUrelease/lib/ -dLCL -d$(INTERFACE) lazpaint.lpr
 endif
 ifeq ($(MULTIBIN),1)
 	mv "$(SOURCE_BIN_DIR)/lazpaint" "$(SOURCE_BIN_DIR)/$(package)"
diff --git a/create_orig b/create_orig
index 83b3fd7e..6254b162 100755
--- a/create_orig
+++ b/create_orig
@@ -5,6 +5,14 @@ if ! [[ "$dirname" =~ ^lazpaint-[0-9]+(\.[0-9]+)*$ ]]; then
     echo "where #[.#][.#] is the app version number"
     exit 1
 fi
+if ! [ -d bgrabitmap ] || ! [ -d bgracontrols ]; then
+    echo "Cannot find bgrabitmap or bgracontrols subdirectories."
+    exit 1
+fi
+if [ -d bgrabitmap/test ] || [ -d lazpaint/release/windows ]; then
+    echo "Lazarus custom packages have not been pruned. Call ./prune_lpk first"
+    exit 1
+fi
 archive=${dirname/-/_}.orig.tar.gz
 read -p "Create \"../${archive}\" file (y/n)?" -n 1 -r
 echo
diff --git a/prune_lpk b/prune_lpk
new file mode 100755
index 00000000..2666d830
--- /dev/null
+++ b/prune_lpk
@@ -0,0 +1,14 @@
+#!/bin/bash
+echo "Warning: make sure you have saved your changes."
+read -p "Delete unnecessary files for Debian package (y/n)?" -n 1 -r
+echo
+if [[ $REPLY =~ ^[Yy]$ ]]
+then
+    rm -rf bgrabitmap/test
+    rm -rf bgrabitmap/libwebp
+    rm -rf bgracontrols/test
+    rm -rf lazpaint/release/windows
+    rm -rf lazpaint/release/macOS
+    rm -rf lazpaint/release/stable
+    echo Done.
+fi