diff --git a/include/net/uip/uip.h b/include/net/uip/uip.h
index 34fd0192ed..35d20cabf4 100644
--- a/include/net/uip/uip.h
+++ b/include/net/uip/uip.h
@@ -83,7 +83,6 @@
                                  * new connection for it, or an active connection has been
                                  * successfully established. */
 #define UIP_TIMEDOUT   (1 << 7) /* The connection has been aborted due to too many retransmissions. */
-#define UIP_APPTIMEOUT (1 << 8) /* Application time limit has elapsed */
 
 /* The TCP states used in the uip_conn->tcpstateflags. */
 
@@ -496,14 +495,14 @@ extern struct uip_udp_conn *uip_udp_conn;
 
 extern struct uip_stats uip_stat;
 
-/* uint16 uip_flags:
+/* uint8 uip_flags:
  *
  * When the application is called, uip_flags will contain the flags
  * that are defined in this file. Please read below for more
  * infomation.
  */
 
-extern uint16 uip_flags;
+extern uint8 uip_flags;
 
 #if UIP_FIXEDADDR
 extern const uip_ipaddr_t uip_hostaddr, uip_netmask, uip_draddr;
diff --git a/net/uip/uip.c b/net/uip/uip.c
index b607fecf7b..bf4d94733c 100644
--- a/net/uip/uip.c
+++ b/net/uip/uip.c
@@ -175,7 +175,7 @@ uint16 uip_urglen, uip_surglen;
 uint16 uip_len, uip_slen;        /* The uip_len is either 8 or 16 bits, depending
                                   * on the maximum packet size. */
 
-uint16 uip_flags;                /* The uip_flags variable is used for communication
+uint8  uip_flags;                /* The uip_flags variable is used for communication
                                   * between the TCP/IP stack and the application
                                   * program. */
 struct uip_conn *uip_conn;       /* uip_conn always points to the current connection. */