diff --git a/build b/build
index 9bba089..be68b4e 100755
--- a/build
+++ b/build
@@ -504,9 +504,10 @@ pmodules::install() {
 	sed "${sed_cmd}" "${SRC_DIR}/modmanage.bash.in"   > "${PMODULES_HOME}/libexec/modmanage.bash"
 	chmod 0755 "${PMODULES_HOME}/libexec/modmanage.bash"
 
-	test -e "${PMODULES_ROOT}/${CONFIG_DIR}/Pmodules.conf" || \
-	    install -m 0644 "${SRC_DIR}/Pmodules.conf"	"${PMODULES_ROOT}/${CONFIG_DIR}"
-	install -m 0755 "${SRC_DIR}/yq"			"${PMODULES_HOME}/libexec"
+	test -e "${PMODULES_ROOT}/${CONFIG_DIR}/Pmodules.yaml" || \
+		install -m 0644 "$_"			"${PMODULES_ROOT}/${CONFIG_DIR}"
+	
+	install -m 0755 "${SRC_DIR}/yq.$(uname -m)_$(uname -s)"	"${PMODULES_HOME}/libexec/yq"
 	install -m 0644 "${SRC_DIR}/bash"		"${PMODULES_HOME}/init"
 	install -m 0644 "${SRC_DIR}/bash_completion"	"${PMODULES_HOME}/init"
 	install -m 0644 "${SRC_DIR}/csh"		"${PMODULES_HOME}/init"