diff --git a/core/net/ipv6/uip6.c b/core/net/ipv6/uip6.c
index d10ed2df7..a5d1db13c 100644
--- a/core/net/ipv6/uip6.c
+++ b/core/net/ipv6/uip6.c
@@ -105,7 +105,10 @@ struct uip_stats uip_stat;
  
 
 /*---------------------------------------------------------------------------*/
-/** @{ \name Layer 2 variables */
+/**
+ * \name Layer 2 variables
+ * @{
+ */
 /*---------------------------------------------------------------------------*/
 /** Host L2 address */
 #if UIP_CONF_LL_802154
@@ -116,7 +119,10 @@ uip_lladdr_t uip_lladdr = {{0x00,0x06,0x98,0x00,0x02,0x32}};
 /** @} */
 
 /*---------------------------------------------------------------------------*/
-/** @{ \name Layer 3 variables */
+/**
+ * \name Layer 3 variables
+ * @{
+ */
 /*---------------------------------------------------------------------------*/
 /**
  * \brief Type of the next header in IPv6 header or extension headers
@@ -141,8 +147,9 @@ uint8_t uip_ext_opt_offset = 0;
 /*---------------------------------------------------------------------------*/
 /* Buffers                                                                   */
 /*---------------------------------------------------------------------------*/
-/** \name Buffer defines
- *  @{
+/**
+ * \name Buffer defines
+ * @{
  */
 #define FBUF                             ((struct uip_tcpip_hdr *)&uip_reassbuf[0])
 #define UIP_IP_BUF                          ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
@@ -161,8 +168,9 @@ uint8_t uip_ext_opt_offset = 0;
 #endif /* UIP_CONF_IPV6_RPL */
 #define UIP_ICMP6_ERROR_BUF            ((struct uip_icmp6_error *)&uip_buf[uip_l2_l3_icmp_hdr_len])
 /** @} */
-/** \name Buffer variables
- *  @{
+/**
+ * \name Buffer variables
+ * @{
  */
 /** Packet buffer for incoming and outgoing packets */
 #ifndef UIP_CONF_EXTERNAL_BUFFER
@@ -185,7 +193,10 @@ uint16_t uip_len, uip_slen;
 /** @} */
 
 /*---------------------------------------------------------------------------*/
-/** @{ \name General variables                                               */
+/**
+ * \name General variables
+ * @{
+ */
 /*---------------------------------------------------------------------------*/
 
 /* The uip_flags variable is used for communication between the TCP/IP stack
@@ -209,7 +220,8 @@ static uint16_t lastport;
 /*---------------------------------------------------------------------------*/
 /* TCP                                                                       */
 /*---------------------------------------------------------------------------*/
-/** \name TCP defines
+/**
+ * \name TCP defines
  *@{
  */
 /* Structures and definitions. */
@@ -227,7 +239,8 @@ static uint16_t lastport;
 
 #define TCP_OPT_MSS_LEN 4   /* Length of TCP MSS option. */
 /** @} */
-/** \name TCP variables
+/**
+ * \name TCP variables
  *@{
  */
 #if UIP_TCP
@@ -248,7 +261,10 @@ static uint16_t tmp16;
 /** @} */
 
 /*---------------------------------------------------------------------------*/
-/** @{ \name UDP variables                                                   */
+/**
+ * \name UDP variables
+ * @{
+ */
 /*---------------------------------------------------------------------------*/
 #if UIP_UDP
 struct uip_udp_conn *uip_udp_conn;
@@ -257,7 +273,10 @@ struct uip_udp_conn uip_udp_conns[UIP_UDP_CONNS];
 /** @} */
 
 /*---------------------------------------------------------------------------*/
-/** @{ \name ICMPv6 variables                                                */
+/**
+ * \name ICMPv6 variables
+ * @{
+ */
 /*---------------------------------------------------------------------------*/
 #if UIP_CONF_ICMP6
 /** single possible icmpv6 "connection" */
diff --git a/doc/uip6-doc.txt b/doc/uip6-doc.txt
index fa9e58d19..a2f95b91e 100644
--- a/doc/uip6-doc.txt
+++ b/doc/uip6-doc.txt
@@ -377,5 +377,7 @@ We pass all the tests for phase 2 except:
 
 
 <HR>
+@{
 */
 /** @} */
+/** @} */