diff --git a/russian/cyrproxy/Makefile b/russian/cyrproxy/Makefile
index 0c12004fda8..c5911499bb4 100644
--- a/russian/cyrproxy/Makefile
+++ b/russian/cyrproxy/Makefile
@@ -1,16 +1,22 @@
 # $FreeBSD: ports/russian/cyrproxy/Makefile,v 1.4 1999/08/31 01:46:57 peter Exp $
-# $OpenBSD: Makefile,v 1.4 2000/03/03 12:45:59 turan Exp $
+# $OpenBSD: Makefile,v 1.5 2000/03/12 13:23:01 form Exp $
 
-DISTNAME=		cyrproxy-1.4.2
-CATEGORIES=		russian net www
-MASTER_SITES=		ftp://ftp.lexa.ru/pub/domestic/lexa/
+DISTNAME=	cyrproxy-1.4.2
+CATEGORIES=	russian net www
+MASTER_SITES=	ftp://ftp.lexa.ru/pub/domestic/lexa/
 
-MAINTAINER=		form@openbsd.org
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+MAINTAINER=	form@openbsd.org
+
+FAKE=		Yes
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/cyrproxy
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cyrproxy
-#	mkdir -p ${PREFIX}/www/cgi-bin
 	${INSTALL_PROGRAM} ${WRKSRC}/cyrproxy ${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${WRKSRC}/tcpspy ${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${WRKSRC}/cyrcoder/cyrtrans ${PREFIX}/bin
@@ -25,6 +31,5 @@ do-install:
 .for f in History README README.http
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/cyrproxy
 .endfor
-	@PKG_PREFIX="${PREFIX}" sh ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/russian/xruskb/Makefile b/russian/xruskb/Makefile
index cc6ab4315fc..017df39b6fa 100644
--- a/russian/xruskb/Makefile
+++ b/russian/xruskb/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2000/03/05 18:30:41 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2000/03/12 13:20:41 form Exp $
 
 DISTNAME=	xruskb-1.13.0
 CATEGORIES=	russian x11
@@ -7,12 +7,12 @@ MASTER_SITES=	ftp://ftp.yars.free.net/pub/software/unix/X11/
 
 MAINTAINER=	form@openbsd.org
 
-LICENSE_TYPE=		GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+FAKE=		Yes
 USE_X11=	Yes
 GNU_CONFIGURE=	Yes
 
@@ -34,8 +34,8 @@ pre-configure:
 .endif
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/Xrus.ad ${X11BASE}/lib/X11/app-defaults/Xrus
-	${INSTALL_DATA} ${WRKSRC}/xrus.doc-english ${X11BASE}/share/xruskb/xrus.doc
-	${INSTALL_DATA} ${WRKSRC}/xrus.doc-koi8 ${X11BASE}/share/xruskb
+	${INSTALL_DATA} ${WRKSRC}/Xrus.ad ${PREFIX}/share/xruskb
+	${INSTALL_DATA} ${WRKSRC}/xrus.doc-english ${PREFIX}/share/xruskb/xrus.doc
+	${INSTALL_DATA} ${WRKSRC}/xrus.doc-koi8 ${PREFIX}/share/xruskb
 
 .include <bsd.port.mk>
diff --git a/russian/xruskb/pkg/DEINSTALL b/russian/xruskb/pkg/DEINSTALL
new file mode 100644
index 00000000000..de55f06f4be
--- /dev/null
+++ b/russian/xruskb/pkg/DEINSTALL
@@ -0,0 +1,24 @@
+# $OpenBSD: DEINSTALL,v 1.1 2000/03/12 13:20:41 form Exp $
+#
+# xruskb de-installation
+
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/X11R6}
+AD_FILE=/var/X11/app-defaults/Xrus
+
+if [ -f ${AD_FILE} ]; then
+	echo
+	echo "+---------------"
+	echo "| To completely deinstall the $1 package you need to perform"
+	echo "| this step as root:"
+	echo "|"
+	echo "|           rm -f ${AD_FILE}"
+	echo "|"
+	echo "| Do not do this if you plan on re-installing $1"
+	echo "| at some future time."
+	echo "+---------------"
+	echo
+fi
+
+exit 0
diff --git a/russian/xruskb/pkg/INSTALL b/russian/xruskb/pkg/INSTALL
new file mode 100644
index 00000000000..6b6de59980a
--- /dev/null
+++ b/russian/xruskb/pkg/INSTALL
@@ -0,0 +1,69 @@
+#!/bin/sh
+# $OpenBSD: INSTALL,v 1.1 2000/03/12 13:20:41 form Exp $
+#
+# Pre/post-installation setup of xruskb
+
+# exit on errors, use a sane path and install prefix
+#
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/X11R6}
+AD_FILE=/var/X11/app-defaults/Xrus
+SAMPLE_AD_FILE=${PREFIX}/share/xruskb/Xrus.ad
+
+# Function: tell the user what s/he needs to do to use the port just installed
+#
+do_notice()
+{
+	echo
+	echo "+---------------"
+	echo "| The existing $1 application defaults file,"
+	echo "| ${AD_FILE}, has NOT been changed."
+	echo "| You may want to compare it to the"
+	echo "| current sample file, ${SAMPLE_AD_FILE},"
+	echo "| and update your configuration as needed."
+	echo "+---------------"
+	echo
+}
+
+# Function: install default application defaults file from the sample
+#
+do_install()
+{
+	install -o root -g wheel -m 444 ${SAMPLE_AD_FILE} ${AD_FILE}
+	echo
+	echo "+---------------"
+	echo "| The $1 application defaults file, ${AD_FILE},"
+	echo "| has been installed.  Please view this file and change"
+	echo "| the configuration to meet your needs."
+	echo "+---------------"
+	echo
+}
+
+# verify proper execution
+#
+if [ $# -ne 2 ]; then
+	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+	exit 1
+fi
+
+# Verify/process the command
+#
+case $2 in
+	PRE-INSTALL)
+		: nothing to pre-install for this port
+		;;
+	POST-INSTALL)
+		if [ -f ${AD_FILE} ]; then
+			do_notice $1
+		else
+			do_install $1
+		fi
+		;;
+	*)
+		echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+		exit 1
+		;;
+esac
+
+exit 0
diff --git a/russian/xruskb/pkg/PLIST b/russian/xruskb/pkg/PLIST
index 1d7b3861b28..82547270613 100644
--- a/russian/xruskb/pkg/PLIST
+++ b/russian/xruskb/pkg/PLIST
@@ -3,6 +3,7 @@ bin/xrusmodmap
 man/man1/xrus.1
 share/xruskb/DocumentL.xpm
 share/xruskb/DocumentY.xpm
+share/xruskb/Xrus.ad
 share/xruskb/jcuken-cp1251.xmm
 share/xruskb/jcuken-cp866.xmm
 share/xruskb/jcuken-cyr.xmm