diff --git a/app-editors/xemacs/xemacs-21.5.36-r2.ebuild b/app-editors/xemacs/xemacs-21.5.36-r2.ebuild
index 6d8ca659530b8..d817319106820 100644
--- a/app-editors/xemacs/xemacs-21.5.36-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.36-r2.ebuild
@@ -65,7 +65,6 @@ src_prepare() {
 	eapply "${FILESDIR}/${P}-failing-tests.patch"
 	eapply "${FILESDIR}/${P}-failing-tests-2.patch"
 	eapply "${FILESDIR}/${P}-configure-postgresql.patch"
-	eapply "${FILESDIR}/${P}-embed.patch"
 	eapply_user
 
 	eautoconf
@@ -186,6 +185,8 @@ src_configure() {
 }
 
 src_compile() {
+	# bug #959756
+	local -x CCACHE_DISABLE=1
 	emake EMACSLOADPATH="${S}"/lisp
 }
 
diff --git a/app-editors/xemacs/xemacs-21.5.9999.ebuild b/app-editors/xemacs/xemacs-21.5.9999.ebuild
index ca2519e9d60a6..b6aa207a9c9c0 100644
--- a/app-editors/xemacs/xemacs-21.5.9999.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.9999.ebuild
@@ -185,6 +185,8 @@ src_configure() {
 }
 
 src_compile() {
+	# bug: #959756
+	local -x CCACHE_DISABLE=1
 	emake EMACSLOADPATH="${S}"/lisp
 }