diff --git a/session.c b/session.c
index 300224e8..7c4f3c85 100644
--- a/session.c
+++ b/session.c
@@ -34,8 +34,8 @@
 #elif defined(WITH_RIOT_GNRC)
 #define _dtls_address_equals_impl(A,B)                          \
   ((A)->size == (B)->size                                       \
-   && (A)->port == (B)->port                                    \
-   && ipv6_addr_equal(&((A)->addr),&((B)->addr))                \
+   && (A)->addr.port == (B)->addr.port                                    \
+   && ipv6_addr_equal(&((A)->addr.addr6),&((B)->addr.addr6))                \
    && (A)->ifindex == (B)->ifindex)
 #else /* WITH_CONTIKI */
 
diff --git a/session.h b/session.h
index a8ac8f3f..7d022034 100644
--- a/session.h
+++ b/session.h
@@ -25,19 +25,21 @@
 #ifdef WITH_CONTIKI
 #include "ip/uip.h"
 typedef struct {
-  unsigned char size;
-  uip_ipaddr_t addr;
-  unsigned short port;
-  int ifindex;
+  unsigned char size;     /**< size of session_t::addr */
+  uip_ipaddr_t addr;      /**< session IP address */
+  unsigned short port;    /**< transport layer port */
+  int ifindex;            /**< network interface index */
 } session_t;
  /* TODO: Add support for RIOT over sockets  */
 #elif defined(WITH_RIOT_GNRC)
 #include "net/ipv6/addr.h"
 typedef struct {
-  unsigned char size;
-  ipv6_addr_t addr;
-  unsigned short port;
-  int ifindex;
+  unsigned char size;     /**< size of session_t::addr */
+  struct {
+    unsigned short port;  /**< transport layer port */
+    ipv6_addr_t addr6;    /**< IPv6 address */
+  } addr;                 /**< session IP address and port */
+  int ifindex;            /**< network interface index */
 } session_t;
 #else /* ! WITH_CONTIKI && ! WITH_RIOT_GNRC */