diff --git a/event_groups.c b/event_groups.c
index 27390e6794a..9be76c4881a 100644
--- a/event_groups.c
+++ b/event_groups.c
@@ -54,6 +54,11 @@
     #define eventUNBLOCKED_DUE_TO_BIT_SET    0x0200U
     #define eventWAIT_FOR_ALL_BITS           0x0400U
     #define eventEVENT_BITS_CONTROL_BYTES    0xff00U
+#elif configUSE_16_BIT_TICKS == 2
+    #define eventCLEAR_EVENTS_ON_EXIT_BIT    0x0100000000000000UL
+    #define eventUNBLOCKED_DUE_TO_BIT_SET    0x0200000000000000UL
+    #define eventWAIT_FOR_ALL_BITS           0x0400000000000000UL
+    #define eventEVENT_BITS_CONTROL_BYTES    0xff00000000000000UL
 #else
     #define eventCLEAR_EVENTS_ON_EXIT_BIT    0x01000000UL
     #define eventUNBLOCKED_DUE_TO_BIT_SET    0x02000000UL
diff --git a/include/projdefs.h b/include/projdefs.h
index 9701e4b00e5..fb629a525eb 100644
--- a/include/projdefs.h
+++ b/include/projdefs.h
@@ -62,6 +62,8 @@ typedef void (* TaskFunction_t)( void * );
 
 #if ( configUSE_16_BIT_TICKS == 1 )
     #define pdINTEGRITY_CHECK_VALUE    0x5a5a
+#elif configUSE_16_BIT_TICKS == 2
+    #define pdINTEGRITY_CHECK_VALUE    0x5a5a5a5a5a5a5a5aUL
 #else
     #define pdINTEGRITY_CHECK_VALUE    0x5a5a5a5aUL
 #endif
diff --git a/portable/GCC/ARM_CM4F/portmacro.h b/portable/GCC/ARM_CM4F/portmacro.h
index 818bb04e332..7a29f039a19 100644
--- a/portable/GCC/ARM_CM4F/portmacro.h
+++ b/portable/GCC/ARM_CM4F/portmacro.h
@@ -60,6 +60,9 @@
     #if ( configUSE_16_BIT_TICKS == 1 )
         typedef uint16_t     TickType_t;
         #define portMAX_DELAY              ( TickType_t ) 0xffff
+    #elif configUSE_16_BIT_TICKS == 2
+        typedef uint64_t     TickType_t;
+        #define portMAX_DELAY              ( TickType_t ) 0xffffffffffffffffUL
     #else
         typedef uint32_t     TickType_t;
         #define portMAX_DELAY              ( TickType_t ) 0xffffffffUL
diff --git a/tasks.c b/tasks.c
index 82ad273ddd9..70687ff4348 100644
--- a/tasks.c
+++ b/tasks.c
@@ -243,6 +243,8 @@
  * to its original value when it is released. */
 #if ( configUSE_16_BIT_TICKS == 1 )
     #define taskEVENT_LIST_ITEM_VALUE_IN_USE    0x8000U
+#elif configUSE_16_BIT_TICKS == 2
+    #define taskEVENT_LIST_ITEM_VALUE_IN_USE    0x8000000000000000UL
 #else
     #define taskEVENT_LIST_ITEM_VALUE_IN_USE    0x80000000UL
 #endif