diff --git a/conf/type/__package_pkg_openbsd/gencode-remote b/conf/type/__package_pkg_openbsd/gencode-remote
index 0ad85458..0cafddd6 100755
--- a/conf/type/__package_pkg_openbsd/gencode-remote
+++ b/conf/type/__package_pkg_openbsd/gencode-remote
@@ -26,7 +26,7 @@
 # set -x
 
 os_version="$(cat "$__global/explorer/os_version")"
-hardware_type="$(cat "$__global/explorer/hardware_type")"
+machine="$(cat "$__global/explorer/machine")"
 
 
 if [ -f "$__object/parameter/flavor" ]; then
@@ -46,7 +46,7 @@ state="$(cat "$__object/parameter/state")"
 pkg_version="$(cat "$__object/explorer/pkg_version")"
 
 # TODO: Shouldn't be hardcoded
-echo export PKG_PATH=ftp://ftp.openbsd.org/pub/OpenBSD/$os_version/packages/$hardware_type/
+echo export PKG_PATH=ftp://ftp.openbsd.org/pub/OpenBSD/$os_version/packages/$machine/
 
 case "$state" in
    installed)
diff --git a/doc/changelog b/doc/changelog
index 490500c7..d5062cb7 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -5,7 +5,6 @@
 	* Renamed explorer: hardware_type to machine
 	* Core: Do not execute empty code fragments
 
-
 1.6.2: 2011-04-19
 	* Core: Introduce __cdist_tmp_base_dir
 	* Core: Cleanup and enhance cdist-type-template