diff --git a/tools/qfcc/include/glsl-lang.h b/tools/qfcc/include/glsl-lang.h
index 7cbdbda02..5371b8ee9 100644
--- a/tools/qfcc/include/glsl-lang.h
+++ b/tools/qfcc/include/glsl-lang.h
@@ -64,6 +64,7 @@ typedef enum glsl_interface_e : unsigned {
 	glsl_uniform,
 	glsl_buffer,
 	glsl_shared,
+	glsl_push_constant,
 
 	glsl_num_interfaces
 } glsl_interface_t;
diff --git a/tools/qfcc/include/specifier.h b/tools/qfcc/include/specifier.h
index 87a9b69b2..8cb30b99a 100644
--- a/tools/qfcc/include/specifier.h
+++ b/tools/qfcc/include/specifier.h
@@ -37,6 +37,7 @@ typedef struct symbol_s symbol_t;
 typedef struct symtab_s symtab_t;
 typedef struct param_s param_t;
 typedef struct attribute_s attribute_t;
+typedef struct glsl_block_s glsl_block_t;
 
 /** Specify the storage class of a def.
 */
@@ -66,6 +67,7 @@ typedef struct specifier_s {
 	param_t    *params;
 	symbol_t   *sym;
 	symtab_t   *symtab;
+	glsl_block_t *block;
 	storage_class_t storage;
 	union {
 		struct {
diff --git a/tools/qfcc/source/glsl-attribute.c b/tools/qfcc/source/glsl-attribute.c
index 21ad83de3..b3a645779 100644
--- a/tools/qfcc/source/glsl-attribute.c
+++ b/tools/qfcc/source/glsl-attribute.c
@@ -48,6 +48,7 @@ const char *glsl_interface_names[glsl_num_interfaces] = {
 	"uniform",
 	"buffer",
 	"shared",
+	"push_constant",
 };
 
 symtab_t *
diff --git a/tools/qfcc/source/glsl-block.c b/tools/qfcc/source/glsl-block.c
index ebe287a11..2d6bd0c9f 100644
--- a/tools/qfcc/source/glsl-block.c
+++ b/tools/qfcc/source/glsl-block.c
@@ -131,6 +131,7 @@ void
 glsl_finish_block (glsl_block_t *block, specifier_t spec)
 {
 	spec.sym = block->name;
+	spec.block = block;
 	int index = 0;
 	for (auto s = block->members->symbols; s; s = s->next) {
 		s->id = index++;
diff --git a/tools/qfcc/source/glsl-layout.c b/tools/qfcc/source/glsl-layout.c
index 58d1ce22f..389195d0c 100644
--- a/tools/qfcc/source/glsl-layout.c
+++ b/tools/qfcc/source/glsl-layout.c
@@ -188,6 +188,9 @@ static void
 glsl_layout_push_constant (const layout_qual_t *qual, specifier_t spec,
 		                   const expr_t *qual_name)
 {
+	if (spec.block) {
+		spec.block->interface = glsl_push_constant;
+	}
 }
 
 static void
@@ -335,7 +338,7 @@ static layout_qual_t layout_qualifiers[] = {
 		.apply = A(glsl_layout_push_constant),
 		.obj_mask = D(block),
 		.var_type = V(any),
-		.if_mask = I(uniform),
+		.if_mask = I(uniform)|I(push_constant),//FIXME push_constant redunant
 	},
 	{	.name = "input_attachment_index",
 		.apply = E(glsl_layout_input_attachment_index),
diff --git a/tools/qfcc/source/target_spirv.c b/tools/qfcc/source/target_spirv.c
index 9c604f5bb..956d49a5e 100644
--- a/tools/qfcc/source/target_spirv.c
+++ b/tools/qfcc/source/target_spirv.c
@@ -923,6 +923,7 @@ spirv_storage_class (unsigned storage, const type_t *type)
 			[glsl_out] = SpvStorageClassOutput,
 			[glsl_uniform] = SpvStorageClassUniform,
 			[glsl_buffer] = SpvStorageClassStorageBuffer,
+			[glsl_push_constant] = SpvStorageClassPushConstant,
 		};
 		sc = iface_storage[interface];
 	} else if (storage < sc_count) {