diff --git a/chocpkg/chocpkg b/chocpkg/chocpkg
index 3db8ccb..ca89742 100755
--- a/chocpkg/chocpkg
+++ b/chocpkg/chocpkg
@@ -33,7 +33,6 @@ END
 basic_setup() {
     if [ -z "${CHOCPKG_ROOT:-}" ]; then
         set_chocpkg_root
-        PATH="$CHOCPKG_ROOT/chocpkg:$PATH"
     fi
 
     PACKAGES_DIR="$CHOCPKG_ROOT/packages"
@@ -49,8 +48,8 @@ basic_setup() {
 
 basic_setup
 
-. chocpkg_functions.sh
-. chocpkg_modules.sh
+. "$CHOCPKG_ROOT/chocpkg/chocpkg_functions.sh"
+. "$CHOCPKG_ROOT/chocpkg/chocpkg_modules.sh"
 . "$CHOCPKG_ROOT/buildenv.sh"
 
 description() {
@@ -214,6 +213,11 @@ setup_build_environment() {
     fi
 }
 
+# Recursive function that wraps the main script.
+chocpkg() {
+    "$0" "$@"
+}
+
 install_dependencies() {
     local i
     for i in "${!DEPENDENCIES[@]}"; do