diff --git a/apel-git/Makefile b/apel-git/Makefile
index 9fb31bc..cf332f5 100644
--- a/apel-git/Makefile
+++ b/apel-git/Makefile
@@ -13,6 +13,7 @@ GIT_REPOSITORIES=	master
 GIT_REPO.master=	http://git.chise.org/git/elisp/apel.git
 GIT_MODULE.master=	apel
 #_GIT_FLAGS+=             --quiet --depth 1
+GIT_DEPTH_SUPPORTED=	no
 
 WRKSRC=			${WRKDIR}/${PKGBASE}
 INFO_FILES=		yes
diff --git a/apel-git/distinfo b/apel-git/distinfo
index bf8b170..adcb9fe 100644
--- a/apel-git/distinfo
+++ b/apel-git/distinfo
@@ -9,7 +9,7 @@ SHA1 (patch-pces-nemacs.el) = 413980cb3f56da122b0be58a1da84efaa2eb6a74
 SHA1 (patch-pces-om.el) = 3983c483823936de9adda4e7a67bc73f657573a2
 SHA1 (patch-pces-raw.el) = f32fccebded96af9faa9de57a2bd048281964f1e
 SHA1 (patch-poe-18.el) = a8ccc7e506922ce2a70952777fce5db73ff0b2ed
-SHA1 (patch-poe.el) = 38afa0b62c6a527364005149949aabec4bb0717e
+SHA1 (patch-poe.el) = 587f46aa8678ed9fd172fc63ecac918bca360196
 SHA1 (patch-poem-e20.el) = fda39649f9e1d739d0734b45d5babf6a13f9d3d2
 SHA1 (patch-poem-ltn1.el) = 417c52e5fc3ec10612b5a55d91dbfad30f8207b4
 SHA1 (patch-poem-nemacs.el) = 04f3bb5426990b9f052e48a3a6238de6d653e9f0
diff --git a/apel-git/patches/patch-poe.el b/apel-git/patches/patch-poe.el
index 7bd23f5..87f7b42 100644
--- a/apel-git/patches/patch-poe.el
+++ b/apel-git/patches/patch-poe.el
@@ -13,9 +13,25 @@ to fix Following problem:
  gmake: *** [elc] Error 255
  ----
 
---- poe.el.orig	2013-10-03 19:21:38.000000000 +0900
-+++ poe.el	2013-10-03 19:33:10.000000000 +0900
-@@ -1667,7 +1667,7 @@ See `walk-windows' for the meaning of MI
+--- poe.el.orig	2016-03-12 23:30:31.000000000 +0900
++++ poe.el	2016-06-14 06:24:45.000000000 +0900
+@@ -1081,7 +1081,6 @@
+ If third arg LITERAL is non-nil, insert NEWTEXT literally.
+ Otherwise treat `\' as special:
+   `\&' in NEWTEXT means substitute original matched text.
+-  `\N' means substitute what matched the Nth `\(...\)'.
+        If Nth parens didn't match, substitute nothing.
+   `\\' means insert one `\'.
+ FIXEDCASE and LITERAL are optional arguments.
+@@ -1133,7 +1132,6 @@
+ If third arg LITERAL is non-nil, insert NEWTEXT literally.
+ Otherwise treat `\' as special:
+   `\&' in NEWTEXT means substitute original matched text.
+-  `\N' means substitute what matched the Nth `\(...\)'.
+        If Nth parens didn't match, substitute nothing.
+   `\\' means insert one `\'.
+ FIXEDCASE and LITERAL are optional arguments.
+@@ -1667,7 +1665,7 @@
                       )))
        ;; arglist: (prefix &optional dir-flag suffix)
        (cond
diff --git a/mk/git-package.mk b/mk/git-package.mk
index bada7c4..e756d53 100644
--- a/mk/git-package.mk
+++ b/mk/git-package.mk
@@ -90,7 +90,7 @@ _GIT_FETCH_FLAGS.${repo}=	--quiet --recurse-submodules=yes --tags
 _GIT_CLONE_FLAGS.${repo}=	--quiet --recursive
 
 # For revision checkout we need deep copy
-. if !defined(GIT_REVISION.${repo})
+. if !defined(GIT_REVISION.${repo}) && empty(GIT_DEPTH_SUPPORTED:M[Nn][Oo])
 _GIT_FETCH_FLAGS.${repo}+=	--depth 1
 _GIT_CLONE_FLAGS.${repo}+=	--depth 1
 . endif