diff --git a/lib/chroot-buildpackages.sh b/lib/functions/extras/buildpkg.sh
similarity index 95%
rename from lib/chroot-buildpackages.sh
rename to lib/functions/extras/buildpkg.sh
index a1cb030cfd..fd07586162 100644
--- a/lib/chroot-buildpackages.sh
+++ b/lib/functions/extras/buildpkg.sh
@@ -1,25 +1,3 @@
-#!/bin/bash
-#
-# Copyright (c) 2013-2021 Igor Pecovnik, igor.pecovnik@gma**.com
-#
-# This file is licensed under the terms of the GNU General Public
-# License version 2. This program is licensed "as is" without any
-# warranty of any kind, whether express or implied.
-#
-# This file is a part of the Armbian build script
-# https://github.com/armbian/build/
-
-# Functions:
-
-# create_chroot
-# chroot_prepare_distccd
-# chroot_build_packages
-# chroot_installpackages_local
-# chroot_installpackages
-
-
-
-
 # create_chroot <target_dir> <release> <arch>
 #
 create_chroot()
@@ -125,8 +103,7 @@ create_chroot()
 
 	touch "${target_dir}"/root/.debootstrap-complete
 	display_alert "Debootstrap complete" "${release}/${arch}" "info"
-} #############################################################################
-
+}
 
 # chroot_prepare_distccd <release> <arch>
 #
@@ -335,7 +312,7 @@ chroot_build_packages()
 			display_alert "$p"
 		done
 	fi
-} #############################################################################
+}
 
 # create build script
 create_build_script ()
@@ -439,7 +416,7 @@ chroot_installpackages_local()
 	EOF
 	chroot_installpackages
 	kill "${aptly_pid}"
-} #############################################################################
+}
 
 # chroot_installpackages <remote_only>
 #
@@ -483,4 +460,4 @@ chroot_installpackages()
 	EOF
 	chmod +x "${SDCARD}"/tmp/install.sh
 	chroot "${SDCARD}" /bin/bash -c "/tmp/install.sh" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1
-} #############################################################################
+}
diff --git a/lib/main.sh b/lib/main.sh
index ff7e2284c3..9c7e456356 100644
--- a/lib/main.sh
+++ b/lib/main.sh
@@ -66,8 +66,6 @@ source "${SRC}/lib/import-functions.sh"
 
 # shellcheck source=compilation-prepare.sh
 source "${SRC}"/lib/compilation-prepare.sh                  # drivers that are not upstreamed
-# shellcheck source=chroot-buildpackages.sh
-source "${SRC}"/lib/chroot-buildpackages.sh                 # chroot packages building
 
 
 # set log path