diff --git a/lang/ruby-devel/Makefile b/lang/ruby-devel/Makefile
index 6f061d620813..33ddd6bcbeb5 100644
--- a/lang/ruby-devel/Makefile
+++ b/lang/ruby-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ruby${RUBY_R}
 PORTVERSION=	${RUBY_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	lang ruby ipv6
 MASTER_SITES=	http://www.ruby-lang.org/~knu/	# ${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	${RUBY_VER}
@@ -89,6 +90,7 @@ post-install:
 .if !empty(RUBY_R)
 	${LN} -fs ${IRB_WITH_SUFFIX} ${IRB_WITHOUT_SUFFIX}${RUBY_R}
 .endif
+	${LDCONFIG} -m ${LOCALBASE}/lib
 	${RUBY_WITH_SUFFIX} ${RUBY_FLAGS} -i -p \
 		-e 'if $$. == 1; ' \
 		-e ' if /^#!/; ' \
@@ -98,6 +100,8 @@ post-install:
 		-e ' end;' \
 		-e 'end' \
 		${IRB_WITH_SUFFIX}
+	${MKDIR} ${LOCALBASE}/lib/xemacs/site-lisp
+	${MKDIR} ${RUBY_ELISPDIR}
 	${MKDIR} ${RUBY_EXAMPLESDIR}
 	${MKDIR} ${RUBY_DOCDIR}
 .if !defined(NOPORTDOCS)
diff --git a/lang/ruby-devel/pkg-plist b/lang/ruby-devel/pkg-plist
index 7aaec03c5282..3a594498b746 100644
--- a/lang/ruby-devel/pkg-plist
+++ b/lang/ruby-devel/pkg-plist
@@ -222,3 +222,5 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/curses
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/pty
 @dirrm %%RUBY_EXAMPLESDIR%%
+@unexec rmdir -p %D/lib/xemacs/site-lisp 2>/dev/null || true
+@unexec rmdir -p %D/%%RUBY_ELISPDIR%% 2>/dev/null || true
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 43762d63c7ea..60850d52b146 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ruby${RUBY_R}
 PORTVERSION=	${RUBY_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	lang ruby ipv6
 MASTER_SITES=	${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	${RUBY_VER}
@@ -87,6 +88,7 @@ post-install:
 .if !empty(RUBY_R)
 	${LN} -fs ${IRB_WITH_SUFFIX} ${IRB_WITHOUT_SUFFIX}${RUBY_R}
 .endif
+	${LDCONFIG} -m ${LOCALBASE}/lib
 	${RUBY_WITH_SUFFIX} ${RUBY_FLAGS} -i -p \
 		-e 'if $$. == 1; ' \
 		-e ' if /^#!/; ' \
@@ -96,6 +98,8 @@ post-install:
 		-e ' end;' \
 		-e 'end' \
 		${IRB_WITH_SUFFIX}
+	${MKDIR} ${LOCALBASE}/lib/xemacs/site-lisp
+	${MKDIR} ${RUBY_ELISPDIR}
 	${MKDIR} ${RUBY_EXAMPLESDIR}
 	${MKDIR} ${RUBY_DOCDIR}
 .if !defined(NOPORTDOCS)
diff --git a/lang/ruby/pkg-plist b/lang/ruby/pkg-plist
index 9a1f8d748d0f..8bb5632bc4f8 100644
--- a/lang/ruby/pkg-plist
+++ b/lang/ruby/pkg-plist
@@ -217,3 +217,5 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/curses
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/pty
 @dirrm %%RUBY_EXAMPLESDIR%%
+@unexec rmdir -p %D/lib/xemacs/site-lisp 2>/dev/null || true
+@unexec rmdir -p %D/%%RUBY_ELISPDIR%% 2>/dev/null || true
diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index 43762d63c7ea..60850d52b146 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ruby${RUBY_R}
 PORTVERSION=	${RUBY_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	lang ruby ipv6
 MASTER_SITES=	${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	${RUBY_VER}
@@ -87,6 +88,7 @@ post-install:
 .if !empty(RUBY_R)
 	${LN} -fs ${IRB_WITH_SUFFIX} ${IRB_WITHOUT_SUFFIX}${RUBY_R}
 .endif
+	${LDCONFIG} -m ${LOCALBASE}/lib
 	${RUBY_WITH_SUFFIX} ${RUBY_FLAGS} -i -p \
 		-e 'if $$. == 1; ' \
 		-e ' if /^#!/; ' \
@@ -96,6 +98,8 @@ post-install:
 		-e ' end;' \
 		-e 'end' \
 		${IRB_WITH_SUFFIX}
+	${MKDIR} ${LOCALBASE}/lib/xemacs/site-lisp
+	${MKDIR} ${RUBY_ELISPDIR}
 	${MKDIR} ${RUBY_EXAMPLESDIR}
 	${MKDIR} ${RUBY_DOCDIR}
 .if !defined(NOPORTDOCS)
diff --git a/lang/ruby16/pkg-plist b/lang/ruby16/pkg-plist
index 9a1f8d748d0f..8bb5632bc4f8 100644
--- a/lang/ruby16/pkg-plist
+++ b/lang/ruby16/pkg-plist
@@ -217,3 +217,5 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/curses
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/pty
 @dirrm %%RUBY_EXAMPLESDIR%%
+@unexec rmdir -p %D/lib/xemacs/site-lisp 2>/dev/null || true
+@unexec rmdir -p %D/%%RUBY_ELISPDIR%% 2>/dev/null || true
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index 6f061d620813..33ddd6bcbeb5 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ruby${RUBY_R}
 PORTVERSION=	${RUBY_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	lang ruby ipv6
 MASTER_SITES=	http://www.ruby-lang.org/~knu/	# ${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	${RUBY_VER}
@@ -89,6 +90,7 @@ post-install:
 .if !empty(RUBY_R)
 	${LN} -fs ${IRB_WITH_SUFFIX} ${IRB_WITHOUT_SUFFIX}${RUBY_R}
 .endif
+	${LDCONFIG} -m ${LOCALBASE}/lib
 	${RUBY_WITH_SUFFIX} ${RUBY_FLAGS} -i -p \
 		-e 'if $$. == 1; ' \
 		-e ' if /^#!/; ' \
@@ -98,6 +100,8 @@ post-install:
 		-e ' end;' \
 		-e 'end' \
 		${IRB_WITH_SUFFIX}
+	${MKDIR} ${LOCALBASE}/lib/xemacs/site-lisp
+	${MKDIR} ${RUBY_ELISPDIR}
 	${MKDIR} ${RUBY_EXAMPLESDIR}
 	${MKDIR} ${RUBY_DOCDIR}
 .if !defined(NOPORTDOCS)
diff --git a/lang/ruby18/pkg-plist b/lang/ruby18/pkg-plist
index 7aaec03c5282..3a594498b746 100644
--- a/lang/ruby18/pkg-plist
+++ b/lang/ruby18/pkg-plist
@@ -222,3 +222,5 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/curses
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/pty
 @dirrm %%RUBY_EXAMPLESDIR%%
+@unexec rmdir -p %D/lib/xemacs/site-lisp 2>/dev/null || true
+@unexec rmdir -p %D/%%RUBY_ELISPDIR%% 2>/dev/null || true