diff --git a/admin/ChangeLog b/admin/ChangeLog
index 9d5eda1cadf..c3b12658b88 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-30  Glenn Morris  <rgm@gnu.org>
+
+	* unidata/Makefile.in (abs_srcdir): New, set by configure.
+	(${DSTDIR}/charprop.el, charprop.el): Update for srcdir not absolute.
+	(clean): Delete all .elc files.
+
 2013-10-23  Glenn Morris  <rgm@gnu.org>
 
 	* unidata/Makefile.in (emacs, ${DSTDIR}/charprop.el):
diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index 91fb5a07305..521f66f5bc4 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -24,6 +24,7 @@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
+abs_srcdir = @abs_srcdir@
 abs_builddir = @abs_builddir@
 top_srcdir = @top_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -41,13 +42,13 @@ unidata.txt: ${srcdir}/UnicodeData.txt
 	sed -e 's/\([^;]*\);\(.*\)/(#x\1 "\2")/' -e 's/;/" "/g' < ${srcdir}/UnicodeData.txt > $@
 
 ${DSTDIR}/charprop.el: ${srcdir}/unidata-gen.elc unidata.txt
-	cd ${DSTDIR} && ${emacs} -l ${srcdir}/unidata-gen \
-	  -f unidata-gen-files ${srcdir} "${abs_builddir}/unidata.txt"
+	cd ${DSTDIR} && ${emacs} -l ${abs_srcdir}/unidata-gen \
+	  -f unidata-gen-files ${abs_srcdir} "${abs_builddir}/unidata.txt"
 
 ## Like the above, but generate in PWD rather than lisp/international.
 charprop.el: ${srcdir}/unidata-gen.elc unidata.txt
-	${emacs} -l ${srcdir}/unidata-gen \
-	  -f unidata-gen-files ${srcdir} unidata.txt
+	${emacs} -L ${srcdir} -l unidata-gen \
+	  -f unidata-gen-files ${srcdir} "${abs_builddir}/unidata.txt"
 
 install: charprop.el
 	cp charprop.el ${DSTDIR}
@@ -57,7 +58,7 @@ clean:
 	if test -f charprop.el; then \
 	  rm -f `sed -n 's/^;; FILE: //p' < charprop.el`; \
 	fi
-	rm -f charprop.el ${srcdir}/unidata-gen.elc unidata.txt
+	rm -f charprop.el ${srcdir}/*.elc unidata.txt
 
 distclean: clean
 	-rm -f ./Makefile