diff --git a/bin/xmonad.hs b/bin/xmonad.hs
index d823b5f..1d9078f 100644
--- a/bin/xmonad.hs
+++ b/bin/xmonad.hs
@@ -288,7 +288,8 @@ xsaneDynamicWorkspace = Sometimes "scanner workspace" xpfXSANE
     c = "Xsane"
 
 f5vpnDynamicWorkspace :: Sometimes DynWorkspace
-f5vpnDynamicWorkspace = sometimesIO_ "F5 VPN workspace" "f5vpn" tree dw
+f5vpnDynamicWorkspace = Sometimes "F5 VPN workspace" xpfF5VPN
+  [Subfeature (IORoot_ dw tree) "f5vpn"]
   where
     tree = Only_ $ sysExe [Package False "f5vpn"] "f5vpn"
     dw = DynWorkspace
diff --git a/lib/XMonad/Internal/Dependency.hs b/lib/XMonad/Internal/Dependency.hs
index 37c928a..2b704cb 100644
--- a/lib/XMonad/Internal/Dependency.hs
+++ b/lib/XMonad/Internal/Dependency.hs
@@ -502,6 +502,7 @@ data XPFeatures = XPFeatures
   , xpfIntelBacklight :: Bool
   , xpfClevoBacklight :: Bool
   , xpfBattery        :: Bool
+  , xpfF5VPN          :: Bool
   }
 
 instance FromJSON XPFeatures where
@@ -515,6 +516,7 @@ instance FromJSON XPFeatures where
     <*> o .:+ "intel_backlight"
     <*> o .:+ "clevo_backlight"
     <*> o .:+ "battery"
+    <*> o .:+ "f5vpn"
 
 defParams :: XParams
 defParams = XParams
@@ -534,6 +536,7 @@ defXPFeatures = XPFeatures
   , xpfIntelBacklight = False
   , xpfClevoBacklight = False
   , xpfBattery = False
+  , xpfF5VPN = False
   }
 
 type XPQuery = XPFeatures -> Bool