diff --git a/.gitattributes b/.gitattributes
index 8378d02c917..7e5534c2383 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -27,6 +27,9 @@ tests/lib/mirrors/method_mirror_source_line_ending_crlf.dart -text
 tests/lib/mirrors/method_mirror_source_line_ending_lf.dart -text
 tests/lib/mirrors/method_mirror_source_test.dart -text
 tests/lib/mirrors/method_mirror_source_other.dart -text
+pkg/dev_compiler/test/codegen/language/multiline_newline_crlf.dart -text
+pkg/dev_compiler/test/codegen/lib/mirrors/method_mirror_source_line_ending_cr.dart -text
+pkg/dev_compiler/test/codegen/lib/mirrors/method_mirror_source_line_ending_crlf.dart -text
 
 # Files to leave alone and not diff.
 *.png binary
diff --git a/DEPS b/DEPS
index e3e8086537b..8e218de831e 100644
--- a/DEPS
+++ b/DEPS
@@ -56,7 +56,6 @@ vars = {
   "dart_services_rev" : "@7aea2574e6f3924bf409a80afb8ad52aa2be4f97",
   "dart_style_tag": "@0.2.9+1",
   "dartdoc_tag" : "@v0.9.7+2",
-  "dev_compiler_rev": "@01d4907cff61ecf934940e7243f79ef68e4bb12b",
   "fixnum_tag": "@0.10.5",
   "func_rev": "@8d4aea75c21be2179cb00dc2b94a71414653094e",
   "glob_rev": "@704cf75e4f26b417505c5c611bdaacd8808467dd",
@@ -201,8 +200,6 @@ deps = {
       (Var("github_mirror") % "dart2js_info") + Var("dart2js_info_rev"),
   Var("dart_root") + "/third_party/pkg/dartdoc":
       (Var("github_mirror") % "dartdoc") + Var("dartdoc_tag"),
-  Var("dart_root") + "/third_party/pkg/dev_compiler":
-      (Var("github_mirror") % "dev_compiler") + Var("dev_compiler_rev"),
   Var("dart_root") + "/third_party/pkg/func":
       (Var("github_dartlang") % "func") + Var("func_rev"),
   Var("dart_root") + "/third_party/pkg/fixnum":
diff --git a/pkg/pkg.gyp b/pkg/pkg.gyp
index 84fced29392..a108bea3a2e 100644
--- a/pkg/pkg.gyp
+++ b/pkg/pkg.gyp
@@ -13,8 +13,9 @@
           'inputs': [
             '../tools/make_links.py',
             '<!@(["python", "../tools/list_pkg_directories.py", "."])',
+            # Exclude DDC's old location in case folks didn't remove it.
             '<!@(["python", "../tools/list_pkg_directories.py", '
-                '"../third_party/pkg"])',
+                '"../third_party/pkg", "--exclude=dev_compiler"])',
             '<!@(["python", "../tools/list_pkg_directories.py", '
                 '"../third_party/pkg_tested"])',
             '<!@(["python", "../tools/list_pkg_directories.py", '
diff --git a/sdk/bin/dartdevc b/sdk/bin/dartdevc
index 331eb4ef395..e2856533abe 100755
--- a/sdk/bin/dartdevc
+++ b/sdk/bin/dartdevc
@@ -43,7 +43,7 @@ fi
 
 DART_ROOT="$(cd "${SDK_DIR}/.." ; pwd -P)"
 
-DEV_COMPILER="$DART_ROOT/third_party/pkg/dev_compiler/bin/dartdevc.dart"
+DEV_COMPILER="$DART_ROOT/pkg/dev_compiler/bin/dartdevc.dart"
 
 if [[ `uname` == 'Darwin' ]];
 then
diff --git a/tools/update_ddc_dep.py b/tools/update_ddc_dep.py
deleted file mode 100755
index d3a3979df5d..00000000000
--- a/tools/update_ddc_dep.py
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/usr/bin/python
-
-# Update ddc dep automatically.
-
-import optparse
-import os
-import re
-from subprocess import Popen, PIPE
-import sys
-
-# Instructions:
-#
-# To run locally:
-#  (a) Create and change to a directory to run the updater in:
-#  mkdir /usr/local/google/home/$USER/ddc_deps_updater
-#
-#  (b) Test by running (Ctrl-C to quit):
-#      > ./update_ddc_deps.py
-#
-#  (c) Run periodical update:
-#      > while true; do ./update_ddc_deps.py --force ; sleep 300 ; done
-
-########################################################################
-# Actions
-########################################################################
-
-def write_file(filename, content):
-  f = open(filename, "w")
-  f.write(content)
-  f.close()
-
-def run_cmd(cmd):
-  print "\n[%s]\n$ %s" % (os.getcwd(), " ".join(cmd))
-  pipe = Popen(cmd, stdout=PIPE, stderr=PIPE)
-  output = pipe.communicate()
-  if pipe.returncode == 0:
-    return output[0]
-  else:
-    print output[1]
-    print "FAILED. RET_CODE=%d" % pipe.returncode
-    sys.exit(pipe.returncode)
-
-def main():
-  option_parser = optparse.OptionParser()
-  option_parser.add_option(
-      '',
-      '--force',
-      help="Push DEPS update to server without prompting",
-      action="store_true",
-      dest="force")
-  options, args = option_parser.parse_args()
-
-  target = 'ddc'
-  repo = 'dev_compiler'
-  repo_name = 'git@github.com:dart-lang/sdk.git'
-  ddc_repo_name = 'git@github.com:dart-lang/%s.git' % (repo)
-  repo_branch = 'origin/master'
-  repo_branch_parts = repo_branch.split('/')
-
-  root_dir = "/usr/local/google/home/%s/ddc_deps_updater" % (os.environ["USER"])
-  src_dir = "%s/sdk" % (root_dir)
-  ddc_dir = "%s/%s" % (root_dir, repo)
-  deps_file = src_dir + '/DEPS'
-
-  os.putenv("GIT_PAGER", "")
-
-  if not os.path.exists(src_dir):
-    print run_cmd(['git', 'clone', repo_name])
-
-  if not os.path.exists(ddc_dir):
-    print run_cmd(['git', 'clone', ddc_repo_name])
-
-  os.chdir(ddc_dir)
-  run_cmd(['git', 'fetch'])
-
-  os.chdir(src_dir)
-  run_cmd(['git', 'fetch'])
-  run_cmd(['git', 'stash'])
-  run_cmd(['git', 'checkout', '-B', repo_branch_parts[1], repo_branch])
-
-  # parse DEPS
-  deps = run_cmd(['cat', deps_file])
-  rev_num = {}
-  revision = '%s_rev":\s*"@(.+)"' % (repo)
-  rev_num = re.search(revision, deps).group(1)
-
-  # update repos
-  all_revs = []
-  os.chdir(ddc_dir)
-
-  output = run_cmd(["git", "log",  "--pretty=%H", "%s..HEAD" % (rev_num),
-      "origin/master"])
-  commits = output.split('\n')
-  if not commits or len(commits[0]) < 10:
-    print "DEPS is up-to-date."
-    sys.exit(0)
-
-  revision = commits[0]
-
-  history = run_cmd(["git", "log",  "--format=short", "%s..HEAD" % (rev_num),
-      "origin/master"])
-
-  print "Pending DEPS update: %s" % (revision)
-
-  # make the next DEPS update
-  os.chdir(src_dir)
-  run_cmd(['rm', deps_file])
-
-  pattern = re.compile('%s_rev":\s*"@(.+)"' % (repo))
-  new_deps = pattern.sub('%s_rev": "@%s"' % (repo, revision), deps)
-  write_file(deps_file, new_deps)
-
-  commit_log = 'DEPS AutoUpdate: %s\n\n' % (repo)
-  commit_log += history
-
-  write_file('commit_log.txt', commit_log)
-  run_cmd(['git', 'add', deps_file])
-
-  print run_cmd(['git', 'diff', 'HEAD'])
-  print
-  print "Commit log:"
-  print "---------------------------------------------"
-  print commit_log
-  print "---------------------------------------------"
-
-  if not options.force:
-    print "Ready to push; press Enter to continue or Control-C to abort..."
-    sys.stdin.readline()
-  print run_cmd(['git', 'commit', '-F', 'commit_log.txt'])
-  print run_cmd(['git', 'push', repo_branch_parts[0], repo_branch_parts[1]])
-  print "Done."
-
-
-if '__main__' == __name__:
-  main()
diff --git a/utils/dartdevc/dartdevc.gyp b/utils/dartdevc/dartdevc.gyp
index 60e3f65ef2d..c945a372284 100644
--- a/utils/dartdevc/dartdevc.gyp
+++ b/utils/dartdevc/dartdevc.gyp
@@ -17,7 +17,7 @@
           'inputs': [
             '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
             '../../sdk/lib/_internal/sdk_library_metadata/lib/libraries.dart',
-            '<!@(["python", "../../tools/list_files.py", "\\.dart$", "../../third_party/pkg/dev_compiler/bin"])',
+            '<!@(["python", "../../tools/list_files.py", "\\.dart$", "../../pkg/dev_compiler/bin"])',
             '<(SHARED_INTERMEDIATE_DIR)/packages.stamp',
             '<(SHARED_INTERMEDIATE_DIR)/pkg_files.stamp',
           ],
@@ -28,7 +28,7 @@
             '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
             '--snapshot=<(SHARED_INTERMEDIATE_DIR)/dartdevc.dart.snapshot',
             '--package-root=<(PRODUCT_DIR)/packages/',
-            '../../third_party/pkg/dev_compiler/bin/dartdevc.dart'
+            '../../pkg/dev_compiler/bin/dartdevc.dart'
           ],
         },
       ],