diff --git a/src/decode-pppoe.c b/src/decode-pppoe.c
index cb3c21329f..7a3e1efeb3 100644
--- a/src/decode-pppoe.c
+++ b/src/decode-pppoe.c
@@ -30,6 +30,7 @@ void DecodePPPOEDiscovery(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p, uint
         DECODER_SET_EVENT(p, PPPOE_PKT_TOO_SMALL);
         return;
     }
+    p->pppoedh = NULL;
 
     p->pppoedh = (PPPOEDiscoveryHdr *)pkt;
     if (p->pppoedh == NULL)
@@ -71,7 +72,7 @@ void DecodePPPOEDiscovery(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p, uint
         return;
     }
 
-    while (pppoe_length >=4 && packet_length >=4)
+    while (pppoedt < (PPPOEDiscoveryTag*) (pkt + (len - sizeof(PPPOEDiscoveryTag))) && pppoe_length >=4 && packet_length >=4)
     {
         tag_type = ntohs(pppoedt->pppoe_tag_type);
         tag_length = ntohs(pppoedt->pppoe_tag_length);
@@ -84,7 +85,7 @@ void DecodePPPOEDiscovery(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p, uint
             pppoe_length = 0; // don't want an underflow
         }
 
-        if (packet_length >= 4+tag_length) {
+        if (packet_length >= 4 + tag_length) {
             packet_length -= (4 + tag_length);
         } else {
             packet_length = 0; // don't want an underflow
@@ -113,7 +114,7 @@ void DecodePPPOESession(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p, uint8_
         return;
 
     SCLogDebug("PPPOE VERSION %" PRIu32 " TYPE %" PRIu32 " CODE %" PRIu32 " SESSIONID %" PRIu32 " LENGTH %" PRIu32 "",
-           p->pppoesh->pppoe_version,  p->pppoesh->pppoe_type,  p->pppoesh->pppoe_code,  ntohs(p->pppoesh->session_id),  ntohs(p->pppoesh->pppoe_length));
+           PPPOE_SESSION_GET_VERSION(p->pppoesh),  PPPOE_SESSION_GET_TYPE(p->pppoesh),  p->pppoesh->pppoe_code,  ntohs(p->pppoesh->session_id),  ntohs(p->pppoesh->pppoe_length));
 
     /* can't use DecodePPP() here because we only get a single 2-byte word to indicate protocol instead of the full PPP header */
 
@@ -353,6 +354,39 @@ static int DecodePPPOEtest05 (void)   {
 
     return 0;
 }
+
+/** DecodePPPOEtest06
+ *  \brief Check that the macros work as expected. Type and version are
+ * fields of 4 bits length. So they are sharing the same var and the macros
+ * should extract the first 4 bits for version and the second 4 bits for type
+ *  \retval 1 Expected test value
+ */
+static int DecodePPPOEtest06 (void)   {
+
+    PPPOESessionHdr pppoesh;
+    PPPOEDiscoveryHdr pppoedh;
+    pppoesh.pppoe_version_type = 0xAB;
+    pppoedh.pppoe_version_type = 0xCD;
+
+    if (PPPOE_SESSION_GET_VERSION(&pppoesh) != 0x0A) {
+        printf("Error, PPPOE macro pppoe_session_get_version failed: ");
+        return 0;
+    }
+    if (PPPOE_SESSION_GET_TYPE(&pppoesh) != 0x0B) {
+        printf("Error, PPPOE macro pppoe_session_get_type failed: ");
+        return 0;
+    }
+    if (PPPOE_DISCOVERY_GET_VERSION(&pppoedh) != 0x0C) {
+        printf("Error, PPPOE macro pppoe_discovery_get_version failed: ");
+        return 0;
+    }
+    if (PPPOE_DISCOVERY_GET_TYPE(&pppoedh) != 0x0D) {
+        printf("Error, PPPOE macro pppoe_discovery_get_type failed: ");
+        return 0;
+    }
+
+    return 1;
+}
 #endif /* UNITTESTS */
 
 
@@ -368,6 +402,7 @@ void DecodePPPOERegisterTests(void) {
     UtRegisterTest("DecodePPPOEtest03", DecodePPPOEtest03, 1);
     UtRegisterTest("DecodePPPOEtest04", DecodePPPOEtest04, 1);
     UtRegisterTest("DecodePPPOEtest05", DecodePPPOEtest05, 1);
+    UtRegisterTest("DecodePPPOEtest06", DecodePPPOEtest06, 1);
 #endif /* UNITTESTS */
 }
 
diff --git a/src/decode-pppoe.h b/src/decode-pppoe.h
index 401d9e00d2..3ec3aa2497 100644
--- a/src/decode-pppoe.h
+++ b/src/decode-pppoe.h
@@ -13,11 +13,14 @@
 
 #define PPPOE_SESSION_HEADER_LEN 8
 #define PPPOE_DISCOVERY_HEADER_MIN_LEN 6
+#define PPPOE_SESSION_GET_VERSION(hdr) ((hdr)->pppoe_version_type & 0xF0) >> 4
+#define PPPOE_SESSION_GET_TYPE(hdr) ((hdr)->pppoe_version_type & 0x0F)
+#define PPPOE_DISCOVERY_GET_VERSION(hdr) ((hdr)->pppoe_version_type & 0xF0) >> 4
+#define PPPOE_DISCOVERY_GET_TYPE(hdr) ((hdr)->pppoe_version_type & 0x0F)
 
 typedef struct PPPOESessionHdr_
 {
-    uint8_t pppoe_version : 4;
-    uint8_t pppoe_type : 4;
+    uint8_t pppoe_version_type;
     uint8_t pppoe_code;
     uint16_t session_id;
     uint16_t pppoe_length;
@@ -32,8 +35,7 @@ typedef struct PPPOEDiscoveryTag_
 
 typedef struct PPPOEDiscoveryHdr_
 {
-    uint8_t pppoe_version : 4;
-    uint8_t pppoe_type : 4;
+    uint8_t pppoe_version_type;
     uint8_t pppoe_code;
     uint16_t discovery_id;
     uint16_t pppoe_length;