diff --git a/.gitignore b/.gitignore
index e3c4e615c..e39d9f114 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,7 +41,9 @@
 *.nso
 *.nro
 *.nacp
+*.npdm
 *.pfs0
+*.nsp
 *.kip
 
 # Debug files
diff --git a/stratosphere/creport/Makefile b/stratosphere/creport/Makefile
index 9598aea90..67fd1e2f4 100644
--- a/stratosphere/creport/Makefile
+++ b/stratosphere/creport/Makefile
@@ -120,7 +120,7 @@ $(BUILD):
 #---------------------------------------------------------------------------------
 clean:
 	@echo clean ...
-	@rm -fr $(BUILD) $(TARGET).nso $(TARGET).elf
+	@rm -fr $(BUILD) $(TARGET).nsp $(TARGET).npdm $(TARGET).nso $(TARGET).elf
 
 
 #---------------------------------------------------------------------------------
@@ -132,7 +132,13 @@ DEPENDS	:=	$(OFILES:.o=.d)
 #---------------------------------------------------------------------------------
 # main targets
 #---------------------------------------------------------------------------------
-all	:	$(OUTPUT).nso
+all	:	$(OUTPUT).nsp
+
+ifeq ($(strip $(APP_JSON)),)
+$(OUTPUT).nsp	:	$(OUTPUT).nso
+else
+$(OUTPUT).nsp	:	$(OUTPUT).nso $(OUTPUT).npdm
+endif
 
 $(OUTPUT).nso	:	$(OUTPUT).elf