diff -Nru php-elisp-1.5.0/debian/changelog php-elisp-1.5.0/debian/changelog
--- php-elisp-1.5.0/debian/changelog	2010-05-09 07:01:27.000000000 +0000
+++ php-elisp-1.5.0/debian/changelog	2010-08-05 20:38:04.000000000 +0000
@@ -1,3 +1,11 @@
+php-elisp (1.5.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Prevent byte compilation on xemacs21, since it's incompatible
+    (Closes: #584698)
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Thu, 05 Aug 2010 16:37:37 -0400
+
 php-elisp (1.5.0-1) unstable; urgency=low
 
   * New upstream release (Closes: #368061, #291207)
diff -Nru php-elisp-1.5.0/debian/php-elisp.emacsen-install php-elisp-1.5.0/debian/php-elisp.emacsen-install
--- php-elisp-1.5.0/debian/php-elisp.emacsen-install	2010-05-09 05:30:07.000000000 +0000
+++ php-elisp-1.5.0/debian/php-elisp.emacsen-install	2010-08-05 20:36:28.000000000 +0000
@@ -9,6 +9,7 @@
 PACKAGE=php-elisp
 
 if [ ${FLAVOR} = emacs ]; then exit 0; fi
+if [ ${FLAVOR} = xemacs21 ]; then exit 0; fi
 
 echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
 
diff -Nru php-elisp-1.5.0/debian/php-elisp.emacsen-remove php-elisp-1.5.0/debian/php-elisp.emacsen-remove
--- php-elisp-1.5.0/debian/php-elisp.emacsen-remove	2010-05-09 05:30:07.000000000 +0000
+++ php-elisp-1.5.0/debian/php-elisp.emacsen-remove	2010-08-05 20:37:14.000000000 +0000
@@ -5,11 +5,13 @@
 PACKAGE=php-elisp
 
 if [ ${FLAVOR} != emacs ]; then
-    if test -x /usr/sbin/install-info-altdir; then
-        echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
-        install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/info/php-elisp.info.gz
-    fi
+    if [ ${FLAVOR} != xemacs21 ]; then
+        if test -x /usr/sbin/install-info-altdir; then
+            echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
+            install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/info/php-elisp.info.gz
+        fi
 
-    echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
-    rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+        echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
+        rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+    fi
 fi