diff --git a/src/libsyntax/parse/obsolete.rs b/src/libsyntax/parse/obsolete.rs
index 1ae8786e09bb2..0f7c50ec8b657 100644
--- a/src/libsyntax/parse/obsolete.rs
+++ b/src/libsyntax/parse/obsolete.rs
@@ -48,6 +48,7 @@ pub enum ObsoleteSyntax {
     ObsoleteUnenforcedBound,
     ObsoleteImplSyntax,
     ObsoleteTraitBoundSeparator,
+    ObsoleteCaptureClause,
 }
 
 pub impl to_bytes::IterBytes for ObsoleteSyntax {
@@ -126,6 +127,10 @@ pub impl Parser {
                 "space-separated trait bounds",
                 "write `+` between trait bounds"
             ),
+            ObsoleteCaptureClause => (
+                "capture clause",
+                "referenced variables are now captured implicitly"
+            ),
         };
 
         self.report(sp, kind, kind_str, desc);
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 9bac163dab6ef..8e4b2b9baaa3c 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -75,7 +75,7 @@ use parse::obsolete::{ObsoleteMoveInit, ObsoleteBinaryMove};
 use parse::obsolete::{ObsoleteStructCtor, ObsoleteWith};
 use parse::obsolete::{ObsoleteSyntax, ObsoleteLowerCaseKindBounds};
 use parse::obsolete::{ObsoleteUnsafeBlock, ObsoleteImplSyntax};
-use parse::obsolete::{ObsoleteTraitBoundSeparator};
+use parse::obsolete::{ObsoleteTraitBoundSeparator, ObsoleteCaptureClause};
 use parse::prec::{as_prec, token_to_binop};
 use parse::token::{can_begin_expr, is_ident, is_ident_or_path};
 use parse::token::{is_plain_ident, INTERPOLATED, special_idents};
@@ -751,8 +751,12 @@ pub impl Parser {
     fn parse_capture_item_or(parse_arg_fn: fn(Parser) -> arg_or_capture_item)
         -> arg_or_capture_item
     {
-        if self.eat_keyword(~"copy") {
+        if self.token_is_keyword(~"copy", *self.token) ||
+            self.token_is_word(~"move", *self.token) {
+
             // XXX outdated syntax now that moves-based-on-type has gone in
+            self.obsolete(*self.span, ObsoleteCaptureClause);
+            self.bump(); // eat move/copy
             self.parse_ident();
             either::Right(())
         } else {
diff --git a/src/test/compile-fail/obsolete-syntax.rs b/src/test/compile-fail/obsolete-syntax.rs
index cd3be9dc3d9d3..473f32652c3da 100644
--- a/src/test/compile-fail/obsolete-syntax.rs
+++ b/src/test/compile-fail/obsolete-syntax.rs
@@ -61,4 +61,14 @@ fn obsolete_moves() {
     //~^ ERROR obsolete syntax: binary move
 }
 
+fn obsolete_capture() {
+    let a = 5;
+    let b = ~"abc";
+
+    let x = |copy a| { };
+    //~^ ERROR obsolete syntax: capture clause
+    let y = |move b| { };
+    //~^ ERROR obsolete syntax: capture clause
+}
+
 fn main() { }
diff --git a/src/test/run-pass/cap-clause-not-used.rs b/src/test/run-pass/cap-clause-not-used.rs
deleted file mode 100644
index e26a8ae11fdb2..0000000000000
--- a/src/test/run-pass/cap-clause-not-used.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// error-pattern: warning: Captured variable 'y' not used in closure
-pub fn main() {
-    let x = 5;
-    let _y = fn~(copy x) { };
-}