diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index 4ea5149a7..9bd153124 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -2184,6 +2184,7 @@ typedef struct hamlib_port {
         } gpio;             /*!< GPIO attributes */
     } parm;                 /*!< Port parameter union */
     int client_port;      /*!< client socket port for tcp connection */
+    RIG *rig;             /*!< our parent RIG device */
 } hamlib_port_t;
 //! @endcond
 
diff --git a/src/rig.c b/src/rig.c
index 656b1d304..9081482c4 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -694,6 +694,7 @@ int HAMLIB_API rig_open(RIG *rig)
 
     caps = rig->caps;
     rs = &rig->state;
+    rs->rigport.rig = rig;
 
     if (strlen(rs->rigport.pathname) > 0)
     {