diff --git a/debian/patches/0001-fix-documentation.diff b/debian/patches/0001-fix-documentation.diff
index 6d02927..1845fb8 100644
--- a/debian/patches/0001-fix-documentation.diff
+++ b/debian/patches/0001-fix-documentation.diff
@@ -5,11 +5,13 @@
 intended rather for developers and are loaded from several external
 web sites.
 
---- a/README-concurrent.ja.markdown
-+++ b/README-concurrent.ja.markdown
+Index: emacs-deferred/README-concurrent.ja.markdown
+===================================================================
+--- emacs-deferred.orig/README-concurrent.ja.markdown
++++ emacs-deferred/README-concurrent.ja.markdown
 @@ -1,12 +1,5 @@
  # concurrent.el #
-
+ 
 -[![Build Status](https://travis-ci.org/kiwanami/emacs-deferred.svg)](https://travis-ci.org/kiwanami/emacs-deferred)
 -[![Coverage Status](https://coveralls.io/repos/kiwanami/emacs-deferred/badge.svg)](https://coveralls.io/r/kiwanami/emacs-deferred)
 -[![MELPA](http://melpa.org/packages/concurrent-badge.svg)](http://melpa.org/#/concurrent)
@@ -18,13 +20,15 @@
 -[![License](http://img.shields.io/:license-gpl3-blue.svg)](http://www.gnu.org/licenses/gpl-3.0.html)
 -
  concurrent.elは、良くある非同期処理を抽象化したライブラリです。スレッド、セマフォ、イベント管理などがあります。他の環境のライブラリや並行プログラミングのアイデアを参考にしました。
-
+ 
  ## インストール ##
---- a/README-concurrent.markdown
-+++ b/README-concurrent.markdown
+Index: emacs-deferred/README-concurrent.markdown
+===================================================================
+--- emacs-deferred.orig/README-concurrent.markdown
++++ emacs-deferred/README-concurrent.markdown
 @@ -1,12 +1,5 @@
  # concurrent.el
-
+ 
 -[![Build Status](https://travis-ci.org/kiwanami/emacs-deferred.svg)](https://travis-ci.org/kiwanami/emacs-deferred)
 -[![Coverage Status](https://coveralls.io/repos/kiwanami/emacs-deferred/badge.svg)](https://coveralls.io/r/kiwanami/emacs-deferred)
 -[![MELPA](http://melpa.org/packages/concurrent-badge.svg)](http://melpa.org/#/concurrent)
@@ -33,13 +37,15 @@
 -[![License](http://img.shields.io/:license-gpl3-blue.svg)](http://www.gnu.org/licenses/gpl-3.0.html)
 -
  `concurrent.el` is a higher level library for asynchronous tasks, based on `deferred.el`.
-
+ 
  It is inspired by libraries of other environments and concurrent programing models.
---- a/README.ja.markdown
-+++ b/README.ja.markdown
+Index: emacs-deferred/README.ja.markdown
+===================================================================
+--- emacs-deferred.orig/README.ja.markdown
++++ emacs-deferred/README.ja.markdown
 @@ -1,12 +1,5 @@
  # deferred.el #
-
+ 
 -[![Build Status](https://travis-ci.org/kiwanami/emacs-deferred.svg)](https://travis-ci.org/kiwanami/emacs-deferred)
 -[![Coverage Status](https://coveralls.io/repos/kiwanami/emacs-deferred/badge.svg)](https://coveralls.io/r/kiwanami/emacs-deferred)
 -[![MELPA](http://melpa.org/packages/deferred-badge.svg)](http://melpa.org/#/deferred)
@@ -50,11 +56,13 @@
  deferred.el は非同期処理を抽象化して書きやすくするためのライブラリです。
  APIや実装については
  [JSDeferred](https://github.com/cho45/jsdeferred "JSDeferred") (by cho45さん)と
---- a/README.markdown
-+++ b/README.markdown
+Index: emacs-deferred/README.markdown
+===================================================================
+--- emacs-deferred.orig/README.markdown
++++ emacs-deferred/README.markdown
 @@ -1,12 +1,5 @@
  # deferred.el #
-
+ 
 -[![Build Status](https://travis-ci.org/kiwanami/emacs-deferred.svg)](https://travis-ci.org/kiwanami/emacs-deferred)
 -[![Coverage Status](https://coveralls.io/repos/kiwanami/emacs-deferred/badge.svg)](https://coveralls.io/r/kiwanami/emacs-deferred)
 -[![MELPA](http://melpa.org/packages/deferred-badge.svg)](http://melpa.org/#/deferred)
@@ -63,5 +71,5 @@
 -[![License](http://img.shields.io/:license-gpl3-blue.svg)](http://www.gnu.org/licenses/gpl-3.0.html)
 -
  `deferred.el` provides facilities to manage asynchronous tasks.
-
+ 
  The API and implementations were translated from
diff --git a/debian/patches/0002-fix-version.diff b/debian/patches/0002-fix-version.diff
index 555b614..bf4aad9 100644
--- a/debian/patches/0002-fix-version.diff
+++ b/debian/patches/0002-fix-version.diff
@@ -3,11 +3,13 @@
 
 This patch fixes version number to follow MELPA stable.
 
---- a/concurrent.el
-+++ b/concurrent.el
+Index: emacs-deferred/concurrent.el
+===================================================================
+--- emacs-deferred.orig/concurrent.el
++++ emacs-deferred/concurrent.el
 @@ -3,7 +3,7 @@
  ;; Copyright (C) 2010-2016  SAKURAI Masashi
-
+ 
  ;; Author: SAKURAI Masashi <m.sakurai at kiwanami.net>
 -;; Version: 0.5.0
 +;; Version: 0.5.1
diff --git a/debian/patches/0003-comment-out-undercover.diff b/debian/patches/0003-comment-out-undercover.diff
index d6ab15d..06ab95a 100644
--- a/debian/patches/0003-comment-out-undercover.diff
+++ b/debian/patches/0003-comment-out-undercover.diff
@@ -8,8 +8,10 @@
 autopkgtest (otherwise autopkgtest fails because it cannot load
 undercover.el)
 
---- a/test/concurrent-test.el
-+++ b/test/concurrent-test.el
+Index: emacs-deferred/test/concurrent-test.el
+===================================================================
+--- emacs-deferred.orig/test/concurrent-test.el
++++ emacs-deferred/test/concurrent-test.el
 @@ -19,10 +19,10 @@
  ;; How to run this test ?
  ;; $ emacs -L . -L $HOME/.emacs.d/elisp -batch -l deferred -l concurrent -l test-concurrent -f cc:test-all
@@ -25,8 +27,10 @@
  (require 'concurrent)
  (require 'cl-lib)
  (require 'pp)
---- a/test/deferred-test.el
-+++ b/test/deferred-test.el
+Index: emacs-deferred/test/deferred-test.el
+===================================================================
+--- emacs-deferred.orig/test/deferred-test.el
++++ emacs-deferred/test/deferred-test.el
 @@ -23,10 +23,10 @@