diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index d8f3121..5a869362 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -64,10 +64,13 @@
     {
       'target_name': 'mojo_system',
       # TODO(vtl): This should probably be '<(component)'; make it work.
-      'type': 'static_library',
+      'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
       ],
+      'defines': [
+        'MOJO_SYSTEM_IMPLEMENTATION',
+      ],
       'sources': [
         'public/system/core.h',
         'system/core.cc',
@@ -120,5 +123,31 @@
         'system/waiter_unittest.cc',
       ],
     },
+    {
+      'target_name': 'mojo_shell',
+      'type': 'executable',
+      'dependencies': [
+        '../base/base.gyp:base',
+        'mojo_system',
+      ],
+      'sources': [
+        'shell/app_container.cc',
+        'shell/app_container.h',
+        'shell/shell.cc',
+        'shell/switches.cc',
+        'shell/switches.h',
+      ],
+    },
+    {
+      'target_name': 'sample_app',
+      'type': '<(component)',
+      'dependencies': [
+        '../base/base.gyp:base',
+        'mojo_system',
+      ],
+      'sources': [
+        'shell/sample_app.cc',
+      ],
+    },
   ],
 }