diff --git a/lang/python-mode.el/Makefile b/lang/python-mode.el/Makefile
index c91a73b871be..51fe740fceaa 100644
--- a/lang/python-mode.el/Makefile
+++ b/lang/python-mode.el/Makefile
@@ -19,16 +19,12 @@ XEMACSLISPDIR=	${PREFIX}/lib/xemacs/site-lisp
 
 LISPFILES=	doctest-mode.el pycomplete.el pycomplete.py python-mode.el
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${EMACSLISPDIR}
-	${MKDIR} ${XEMACSLISPDIR}
-	for i in ${LISPFILES}; do \
-		${INSTALL_DATA} ${WRKSRC}/$${i} ${EMACSLISPDIR}/$${i}; \
-		${LN} -sf ${EMACSLISPDIR}/$${i} ${XEMACSLISPDIR}; \
-	done;
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${EMACSLISPDIR}
+	@${MKDIR} ${STAGEDIR}${XEMACSLISPDIR}
+.for i in ${LISPFILES}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${EMACSLISPDIR}
+	${LN} -sf ${EMACSLISPDIR}/${i} ${STAGEDIR}${XEMACSLISPDIR}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/lang/python-mode.el/pkg-plist b/lang/python-mode.el/pkg-plist
index e2b03a9fde96..d599cd24351b 100644
--- a/lang/python-mode.el/pkg-plist
+++ b/lang/python-mode.el/pkg-plist
@@ -1,15 +1,10 @@
+lib/xemacs/site-lisp/doctest-mode.el
+lib/xemacs/site-lisp/python-mode.el
+lib/xemacs/site-lisp/pycomplete.el
+lib/xemacs/site-lisp/pycomplete.py
 share/emacs/site-lisp/doctest-mode.el
 share/emacs/site-lisp/python-mode.el
 share/emacs/site-lisp/pycomplete.el
 share/emacs/site-lisp/pycomplete.py
-@exec mkdir -p %D/lib/xemacs/site-lisp
-@exec ln -sf %D/share/emacs/site-lisp/doctest-mode.el %D/lib/xemacs/site-lisp
-@exec ln -sf %D/share/emacs/site-lisp/python-mode.el %D/lib/xemacs/site-lisp
-@exec ln -sf %D/share/emacs/site-lisp/pycomplete.el %D/lib/xemacs/site-lisp
-@exec ln -sf %D/share/emacs/site-lisp/pycomplete.py %D/lib/xemacs/site-lisp
-@unexec rm %D/lib/xemacs/site-lisp/doctest-mode.el 2>/dev/null || true
-@unexec rm %D/lib/xemacs/site-lisp/python-mode.el 2>/dev/null || true
-@unexec rm %D/lib/xemacs/site-lisp/pycomplete.el 2>/dev/null || true
-@unexec rm %D/lib/xemacs/site-lisp/pycomplete.py 2>/dev/null || true
 @dirrmtry lib/xemacs/site-lisp
 @dirrmtry lib/xemacs