diff --git a/components/upload/demo/basic.md b/components/upload/demo/basic.md
index fd5659d200..075610093a 100644
--- a/components/upload/demo/basic.md
+++ b/components/upload/demo/basic.md
@@ -8,13 +8,18 @@
 
 ````jsx
 var Upload = antd.Upload;
+var message = antd.message;
 
 var props = {
   action: '/upload.do',
   onChange(info) {
     if (info.file.status !== 'uploading') {
-      console.log(info.file);
-      console.log(info.fileList);
+      console.log(info.file, info.fileList);
+    }
+    if (info.file.status === 'done') {
+      message.success(info.file.name + ' 上传成功。');
+    } else if (info.file.error) {
+      message.error(info.file.name + ' 上传失败。');
     }
   }
 };
diff --git a/components/upload/index.jsx b/components/upload/index.jsx
index e8f2b1c665..406863332c 100644
--- a/components/upload/index.jsx
+++ b/components/upload/index.jsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import Upload from 'rc-upload';
 import assign from 'object-assign';
-import Message from '../message';
 import UploadList from './uploadList';
 import getFileItem from './getFileItem';
 const prefixCls = 'ant-upload';
@@ -37,7 +36,6 @@ const AntUpload = React.createClass({
   },
   onSuccess(response, file) {
     let fileList = this.state.fileList.concat();
-    Message.success(file.name + '上传完成。');
     let targetItem = getFileItem(file, fileList);
     // 之前已经删除
     if (targetItem) {
@@ -61,7 +59,6 @@ const AntUpload = React.createClass({
     }
   },
   onError(error, response, file) {
-    Message.error(file.name + ' 上传失败。');
     file.error = error;
     file.response = response;
     this.handleRemove(file);