diff --git a/create_sdk.gyp b/create_sdk.gyp
index e1896bade6c..59e157b7955 100644
--- a/create_sdk.gyp
+++ b/create_sdk.gyp
@@ -13,6 +13,7 @@
         'utils/pub/pub.gyp:pub',
         'utils/pub/pub.gyp:core_stubs',
         'utils/dartfmt/dartfmt.gyp:dartfmt',
+        'utils/analysis_server/analysis_server.gyp:analysis_server',
         'utils/dartanalyzer/dartanalyzer.gyp:dartanalyzer',
       ],
       'actions': [
@@ -31,6 +32,7 @@
             '<(SHARED_INTERMEDIATE_DIR)/dartanalyzer.dart.snapshot',
             '<(SHARED_INTERMEDIATE_DIR)/dartfmt.dart.snapshot',
             '<(SHARED_INTERMEDIATE_DIR)/core_stubs/dart_io.dart',
+            '<(SHARED_INTERMEDIATE_DIR)/analysis_server.dart.snapshot',
             'tools/VERSION'
           ],
           'outputs': [
diff --git a/dart.gyp b/dart.gyp
index 86a0bae4e24..41f90c3219a 100644
--- a/dart.gyp
+++ b/dart.gyp
@@ -8,6 +8,7 @@
       'target_name': 'most',
       'type': 'none',
       'dependencies': [
+        'analysis_server',
         'analyzer_java',
         'create_sdk',
         'dart2js',
@@ -69,6 +70,13 @@
         'utils/dartfmt/dartfmt.gyp:dartfmt',
       ],
     },
+    {
+      'target_name': 'analysis_server',
+      'type': 'none',
+      'dependencies': [
+        'utils/analysis_server/analysis_server.gyp:analysis_server',
+      ],
+    },
     {
       # This is the target that is built on the dart2dart bots.
       # It must depend on anything that is required by dart2dart
diff --git a/tools/create_sdk.py b/tools/create_sdk.py
index 20b98f31ab7..6a43e75f75f 100755
--- a/tools/create_sdk.py
+++ b/tools/create_sdk.py
@@ -20,6 +20,7 @@
 # ......dartanalyzer
 # ......pub
 # ......snapshots/
+# ........analysis_server.dart.snapshot
 # ........dart2js.dart.snapshot
 # ........dartanalyzer.dart.snapshot
 # ........dartfmt.dart.snapshot
@@ -112,8 +113,8 @@ def CopyDartScripts(home, sdk_root):
 
 
 def CopySnapshots(snapshots, sdk_root):
-  for snapshot in ['dart2js', 'dartanalyzer', 'dartfmt', 'utils_wrapper',
-                   'pub']:
+  for snapshot in ['analysis_server', 'dart2js', 'dartanalyzer', 'dartfmt', 
+                   'utils_wrapper', 'pub']:
     snapshot += '.dart.snapshot'
     copyfile(join(snapshots, snapshot),
              join(sdk_root, 'bin', 'snapshots', snapshot))
diff --git a/utils/analysis_server/.gitignore b/utils/analysis_server/.gitignore
new file mode 100644
index 00000000000..010faca1007
--- /dev/null
+++ b/utils/analysis_server/.gitignore
@@ -0,0 +1,3 @@
+/analysis_server.Makefile
+/analysis_server.target.mk
+
diff --git a/utils/analysis_server/analysis_server.gyp b/utils/analysis_server/analysis_server.gyp
new file mode 100644
index 00000000000..99e059bee9e
--- /dev/null
+++ b/utils/analysis_server/analysis_server.gyp
@@ -0,0 +1,37 @@
+# Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+# for details. All rights reserved. Use of this source code is governed by a
+# BSD-style license that can be found in the LICENSE file.
+
+{
+  'targets': [
+    {
+      'target_name': 'analysis_server',
+      'type': 'none',
+      'dependencies': [
+        '../../runtime/dart-runtime.gyp:dart',
+        '../../pkg/pkg.gyp:pkg_packages',
+        '../../pkg/pkg_files.gyp:pkg_files_stamp'
+      ],
+      'actions': [
+        {
+          'action_name': 'generate_analysis_server_snapshot',
+          'inputs': [
+            '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
+            '../../sdk/lib/_internal/libraries.dart',
+            '<(SHARED_INTERMEDIATE_DIR)/packages.stamp',
+            '<(SHARED_INTERMEDIATE_DIR)/pkg_files.stamp',
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/analysis_server.dart.snapshot',
+          ],
+          'action': [
+            '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
+            '--snapshot=<(SHARED_INTERMEDIATE_DIR)/analysis_server.dart.snapshot',
+            '--package-root=<(PRODUCT_DIR)/packages/',
+            '../../pkg/analysis_server/bin/server.dart',
+          ],
+        },
+      ],
+    },
+  ],
+}