diff --git a/src/configure.c b/src/configure.c
index 892974c..f879ceb 100644
--- a/src/configure.c
+++ b/src/configure.c
@@ -134,8 +134,8 @@ const struct ExtensionType _sExtensionType[] =
 	{ "c++",	OT_CXX_SOURCE		},
 	{ "asm",	OT_ASM_SOURCE		},
 	{ "s",		OT_ASM_SOURCE		},
-	{ "S",		OT_ASM_SOURCE		},
-	{ "sx",		OT_ASM_SOURCE		},
+	{ "S",		OT_ASMPP_SOURCE		},
+	{ "sx",		OT_ASMPP_SOURCE		},
 	{ "m",		OT_OBJC_SOURCE		},
 	{ "mm",		OT_OBJCXX_SOURCE	},
 	{ "v",		OT_VERILOG_SOURCE	},
diff --git a/src/configure.h b/src/configure.h
index 7db619a..44381f1 100644
--- a/src/configure.h
+++ b/src/configure.h
@@ -99,6 +99,7 @@ typedef enum _ObjectType
 	OT_C_SOURCE = 0,
 	OT_CXX_SOURCE,
 	OT_ASM_SOURCE,
+	OT_ASMPP_SOURCE,
 	OT_OBJC_SOURCE,
 	OT_OBJCXX_SOURCE,
 	OT_VERILOG_SOURCE,
diff --git a/src/makefile.c b/src/makefile.c
index e57001e..1aedf2c 100644
--- a/src/makefile.c
+++ b/src/makefile.c
@@ -1002,6 +1002,7 @@ static int _objs_source(Makefile * makefile, String * source, TargetType tt)
 	switch(source_type(extension))
 	{
 		case OT_ASM_SOURCE:
+		case OT_ASMPP_SOURCE:
 		case OT_C_SOURCE:
 		case OT_CXX_SOURCE:
 		case OT_OBJC_SOURCE:
@@ -1092,6 +1093,7 @@ static int _target_flags(Makefile * makefile, String const * target)
 			switch(type)
 			{
 				case OT_ASM_SOURCE:
+				case OT_ASMPP_SOURCE:
 					_flags_asm(makefile, target);
 					break;
 				case OT_OBJC_SOURCE:
@@ -1379,6 +1381,7 @@ static int _target_object(Makefile * makefile,
 	switch(source_type(extension))
 	{
 		case OT_ASM_SOURCE:
+		case OT_ASMPP_SOURCE:
 			_makefile_print(makefile, "\n%s%s%s%s\n%s%s",
 					target, "_OBJS = ", "$(OBJDIR)", target,
 					target, "_ASFLAGS ="
@@ -1663,6 +1666,7 @@ static int _target_source(Makefile * makefile,
 	switch((ot = source_type(extension)))
 	{
 		case OT_ASM_SOURCE:
+		case OT_ASMPP_SOURCE:
 			if(tt == TT_OBJECT)
 				_makefile_print(makefile, "%s%s", "\n$(OBJDIR)",
 						target);