diff --git a/package/confd/confd.mk b/package/confd/confd.mk
index 7cfb2347..e01756ca 100644
--- a/package/confd/confd.mk
+++ b/package/confd/confd.mk
@@ -30,6 +30,11 @@ CONFD_CONF_OPTS += --enable-wifi
 else
 CONFD_CONF_OPTS += --disable-wifi
 endif
+ifeq ($(BR2_PACKAGE_FEATURE_GPS),y)
+CONFD_CONF_OPTS += --enable-gps
+else
+CONFD_CONF_OPTS += --disable-gps
+endif
 define CONFD_INSTALL_EXTRA
 	for fn in confd.conf resolvconf.conf; do \
 		cp $(CONFD_PKGDIR)/$$fn  $(FINIT_D)/available/; \
@@ -80,6 +85,12 @@ define CONFD_INSTALL_YANG_MODULES_WIFI
 	$(BR2_EXTERNAL_INFIX_PATH)/utils/srload $(@D)/yang/wifi.inc
 endef
 endif
+ifeq ($(BR2_PACKAGE_FEATURE_GPS),y)
+define CONFD_INSTALL_YANG_MODULES_GPS
+	$(COMMON_SYSREPO_ENV) \
+	$(BR2_EXTERNAL_INFIX_PATH)/utils/srload $(@D)/yang/gps.inc
+endef
+endif
 
 # PER_PACKAGE_DIR
 # Since the last package in the dependency chain that runs sysrepoctl is confd, we need to
@@ -109,6 +120,7 @@ CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_EXTRA
 CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_YANG_MODULES
 CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_YANG_MODULES_CONTAINERS
 CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_YANG_MODULES_WIFI
+CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_YANG_MODULES_GPS
 CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_IN_ROMFS
 CONFD_TARGET_FINALIZE_HOOKS += CONFD_CLEANUP
 
diff --git a/src/confd/configure.ac b/src/confd/configure.ac
index 6266615b..f8071c2c 100644
--- a/src/confd/configure.ac
+++ b/src/confd/configure.ac
@@ -46,6 +46,10 @@ AC_ARG_ENABLE(wifi,
         AS_HELP_STRING([--enable-wifi], [Enable support for Wi-Fi]),,[
 	enable_wifi=no])
 
+AC_ARG_ENABLE(gps,
+        AS_HELP_STRING([--enable-gps], [Enable support for GPS receivers]),,[
+	enable_gps=no])
+
 AC_ARG_WITH(login-shell,
         AS_HELP_STRING([--with-login-shell=shell], [Login shell for new users, default: /bin/false]),
 	[login_shell=$withval], [login_shell=yes])
@@ -60,6 +64,9 @@ AS_IF([test "x$enable_containers" = "xyes"], [
 AS_IF([test "x$enable_wifi" = "xyes"], [
         AC_DEFINE(HAVE_WIFI, 1, [Built with Wi-Fi support])])
 
+AS_IF([test "x$enable_gps" = "xyes"], [
+        AC_DEFINE(HAVE_GPS, 1, [Built with GPS receiver support])])
+
 AS_IF([test "x$with_login_shell" != "xno"], [
 	AS_IF([test "x$login_shell" = "xyes"], [login_shell=/bin/false])
 	AC_DEFINE_UNQUOTED(LOGIN_SHELL, "$login_shell", [Default: /bin/false])],[
@@ -131,6 +138,7 @@ cat <<EOF
 Optional features:
   Container support ....: $enable_containers
   Wi-Fi support ........: $enable_wifi
+  GPS support ..........: $enable_gps
   Login shell ..........: $login_shell
   Default crypt algo ...: $crypt
 
diff --git a/src/confd/yang/confd/infix-hardware.yang b/src/confd/yang/confd/infix-hardware.yang
index b28ada61..6da99e9b 100644
--- a/src/confd/yang/confd/infix-hardware.yang
+++ b/src/confd/yang/confd/infix-hardware.yang
@@ -45,6 +45,13 @@ module infix-hardware {
     description "Initial";
     reference "internal";
   }
+  feature wifi {
+    description "WiFi support is an optional build-time feature in Infix.";
+  }
+
+  feature gps {
+    description "GPS support is an optional build-time feature in Infix.";
+  }
 
   typedef country-code {
     type string {
@@ -104,11 +111,13 @@ module infix-hardware {
     description "This identity is used to a VPD memory on the device.";
   }
   identity wifi {
+    if-feature wifi;
     base iahw:hardware-class;
     description "This identity is used to describe a WiFi radio/PHY";
   }
 
   identity gps {
+    if-feature gps;
     base iahw:hardware-class;
     description "GPS/GNSS receiver for time synchronization";
   }
@@ -211,6 +220,7 @@ module infix-hardware {
      */
 
     container wifi-radio {
+      if-feature wifi;
       when "derived-from-or-self(../iehw:class, 'ih:wifi')";
       presence "WiFi radio configuration";
       description
@@ -534,6 +544,7 @@ module infix-hardware {
      */
 
     container gps-receiver {
+      if-feature gps;
       when "derived-from-or-self(../iehw:class, 'ih:gps')";
       presence "GPS receiver configuration";
       description
diff --git a/src/confd/yang/gps.inc b/src/confd/yang/gps.inc
new file mode 100644
index 00000000..f009b15e
--- /dev/null
+++ b/src/confd/yang/gps.inc
@@ -0,0 +1,3 @@
+MODULES=(
+	"infix-hardware -e gps"
+)
diff --git a/src/confd/yang/wifi.inc b/src/confd/yang/wifi.inc
index 280851db..21d9a93c 100644
--- a/src/confd/yang/wifi.inc
+++ b/src/confd/yang/wifi.inc
@@ -1,4 +1,5 @@
 MODULES=(
 	"infix-interfaces -e wifi"
+	"infix-hardware -e wifi"
 	"infix-if-type -e wifi"
 )