diff --git a/package/libs/gettext-full/Makefile b/package/libs/gettext-full/Makefile
index deb484010..db6aee750 100644
--- a/package/libs/gettext-full/Makefile
+++ b/package/libs/gettext-full/Makefile
@@ -19,6 +19,7 @@ HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/gettext-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 PKG_LICENSE:=GPL-3.0+
+PKG_CPE_ID:=cpe:/a:gnu:gettext
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
diff --git a/package/libs/gettext-full/patches/000-relocatable.patch b/package/libs/gettext-full/patches/000-relocatable.patch
index c14be7283..a95c268f5 100644
--- a/package/libs/gettext-full/patches/000-relocatable.patch
+++ b/package/libs/gettext-full/patches/000-relocatable.patch
@@ -5,8 +5,8 @@
  # Set variables
  # - gettext_datadir     directory where the data files are stored.
 -prefix="@prefix@"
-+if [ -n "$STAGING_DIR" ]; then
-+	prefix="$STAGING_DIR/host"
++if [ -n "$STAGING_DIR_HOSTPKG" ]; then
++	prefix="$STAGING_DIR_HOSTPKG"
 +else
 +	prefix="@prefix@"
 +fi
@@ -20,8 +20,8 @@
  # Set variables
  # - gettext_datadir     directory where the data files are stored.
 -prefix="@prefix@"
-+if [ -n "$STAGING_DIR" ]; then
-+	prefix="$STAGING_DIR/host"
++if [ -n "$STAGING_DIR_HOSTPKG" ]; then
++	prefix="$STAGING_DIR_HOSTPKG"
 +else
 +	prefix="@prefix@"
 +fi