diff --git a/swift3-mode-beginning-of-defun.el b/swift3-mode-beginning-of-defun.el
index 536b829..d2f1298 100644
--- a/swift3-mode-beginning-of-defun.el
+++ b/swift3-mode-beginning-of-defun.el
@@ -4,7 +4,7 @@
 
 ;; Authors: taku0 (http://github.com/taku0)
 ;;
-;; Version: 2.1
+;; Version: 2.1.1
 ;; Package-Requires: ((emacs "24.4"))
 ;; Keywords: languages swift
 
diff --git a/swift3-mode-font-lock.el b/swift3-mode-font-lock.el
index acf8509..4070a51 100644
--- a/swift3-mode-font-lock.el
+++ b/swift3-mode-font-lock.el
@@ -7,7 +7,7 @@
 ;;       Bozhidar Batsov <bozhidar@batsov.com>
 ;;       Arthur Evstifeev <lod@pisem.net>
 ;;
-;; Version: 2.1
+;; Version: 2.1.1
 ;; Package-Requires: ((emacs "24.4"))
 ;; Keywords: languages swift
 
diff --git a/swift3-mode-indent.el b/swift3-mode-indent.el
index 6de9e2d..1731182 100644
--- a/swift3-mode-indent.el
+++ b/swift3-mode-indent.el
@@ -7,7 +7,7 @@
 ;;       Bozhidar Batsov <bozhidar@batsov.com>
 ;;       Arthur Evstifeev <lod@pisem.net>
 ;;
-;; Version: 2.1
+;; Version: 2.1.1
 ;; Package-Requires: ((emacs "24.4"))
 ;; Keywords: languages swift
 
diff --git a/swift3-mode-lexer.el b/swift3-mode-lexer.el
index 0b1d048..0a01a57 100644
--- a/swift3-mode-lexer.el
+++ b/swift3-mode-lexer.el
@@ -7,7 +7,7 @@
 ;;       Bozhidar Batsov <bozhidar@batsov.com>
 ;;       Arthur Evstifeev <lod@pisem.net>
 ;;
-;; Version: 2.1
+;; Version: 2.1.1
 ;; Package-Requires: ((emacs "24.4"))
 ;; Keywords: languages swift
 
diff --git a/swift3-mode-repl.el b/swift3-mode-repl.el
index 835363e..a2de01c 100644
--- a/swift3-mode-repl.el
+++ b/swift3-mode-repl.el
@@ -7,7 +7,7 @@
 ;;       Bozhidar Batsov <bozhidar@batsov.com>
 ;;       Arthur Evstifeev <lod@pisem.net>
 ;;
-;; Version: 2.1
+;; Version: 2.1.1
 ;; Package-Requires: ((emacs "24.4"))
 ;; Keywords: languages swift
 
diff --git a/swift3-mode.el b/swift3-mode.el
index e97431b..613786d 100644
--- a/swift3-mode.el
+++ b/swift3-mode.el
@@ -7,7 +7,7 @@
 ;;       Bozhidar Batsov <bozhidar@batsov.com>
 ;;       Arthur Evstifeev <lod@pisem.net>
 ;;
-;; Version: 2.1
+;; Version: 2.1.1
 ;; Package-Requires: ((emacs "24.4"))
 ;; Keywords: languages swift
 ;; URL: https://github.com/taku0/swift3-mode
@@ -147,7 +147,8 @@
   (setq-local imenu-generic-expression swift3-mode:imenu-generic-expression)
 
   (setq-local beginning-of-defun-function #'swift3-mode:beginning-of-defun)
-  (setq-local end-of-defun-function #'swift3-mode:end-of-defun))
+  (setq-local end-of-defun-function #'swift3-mode:end-of-defun)
+  (message "swift3-mode has been merged into swift-mode. Please uninstall swift3-mode and install swift-mode."))
 
 ;;;###autoload (add-to-list 'auto-mode-alist '("\\.swift\\'" . swift3-mode))
 
diff --git a/test/swift3-mode-test-indent.el b/test/swift3-mode-test-indent.el
index 06c80e6..a2da231 100644
--- a/test/swift3-mode-test-indent.el
+++ b/test/swift3-mode-test-indent.el
@@ -4,7 +4,7 @@
 
 ;; Authors: taku0 (http://github.com/taku0)
 ;;
-;; Version: 2.1
+;; Version: 2.1.1
 ;; Package-Requires: ((emacs "24.4"))
 ;; Keywords: languages swift
 ;; URL: https://github.com/taku0/swift3-mode