diff --git a/branches/CardCupForNBD/CardCup/CardCup.rsf b/branches/CardCupForNBD/CardCup/CardCup.rsf
index edf44a5..29cec33 100644
--- a/branches/CardCupForNBD/CardCup/CardCup.rsf
+++ b/branches/CardCupForNBD/CardCup/CardCup.rsf
@@ -1,5 +1,6 @@
 BasicInfo:
   Title:   SelfCup
+  ProductCode: CTR-P-234A
   BackupMemoryType: None
   Logo: Nintendo
 
diff --git a/branches/CardCupForNBD/CardCup/main.cpp b/branches/CardCupForNBD/CardCup/main.cpp
index eefb523..2be4b2a 100644
--- a/branches/CardCupForNBD/CardCup/main.cpp
+++ b/branches/CardCupForNBD/CardCup/main.cpp
@@ -26,6 +26,7 @@
 #include <nn/am.h>
 #include <nn/ndm.h>
 #include <nn/cfg.h>
+#include <nn/ptm_Private.h>
 
 #include <nn/cup.h>
 
@@ -280,8 +281,16 @@ extern "C" void nnMain()
 
     s_scrollBuffer->AppendText("")->Render();
 
+    nn::os::Tick before = nn::os::Tick::GetSystemCurrent();
+    const u8 SHUTDOWN_WAIT_SECONDS = 2;
     for(;;)
     {
+        nn::os::Tick current = nn::os::Tick::GetSystemCurrent();
+        if((current - before).ToTimeSpan().GetSeconds() > SHUTDOWN_WAIT_SECONDS)
+        {
+            break;
+        }
+
         s_RenderSystem.SetRenderTarget(NN_GX_DISPLAY0);
         if(result.IsSuccess() || result == nn::cup::CTR::ResultUpdateNotRequired())
         {
@@ -309,6 +318,8 @@ extern "C" void nnMain()
             nn::applet::PrepareToCloseApplication();
             nn::applet::CloseApplication();
         }
-
     }
+
+    nn::ns::ShutdownAsync();
+    nn::ns::FinalizeForShell();
 }