diff --git a/slapi-nis-paths.patch b/slapi-nis-paths.patch
new file mode 100644
index 0000000..c3ed6ed
--- /dev/null
+++ b/slapi-nis-paths.patch
@@ -0,0 +1,27 @@
+Take advantage of the server's ability to prepend the right directory name
+and append the right extension to make the resulting file multilib-safe.
+
+diff -ru slapi-nis-0.8.5/doc/nis-plugin.ldif.in slapi-nis-0.8.5/doc/nis-plugin.ldif.in
+--- slapi-nis-0.8.5/doc/nis-plugin.ldif.in	2008-12-08 14:00:53.000000000 -0500
++++ slapi-nis-0.8.5/doc/nis-plugin.ldif.in	2008-12-09 11:18:13.000000000 -0500
+@@ -3,7 +3,7 @@
+ objectclass: nsSlapdPlugin
+ objectclass: extensibleObject
+ cn: NIS Server
+-nsslapd-pluginpath: @myplugindir@/nisserver-plugin.so
++nsslapd-pluginpath: nisserver-plugin
+ nsslapd-plugininitfunc: nis_plugin_init
+ nsslapd-plugintype: object
+ nsslapd-pluginenabled: on
+diff -ru slapi-nis-0.8.5/doc/sch-plugin.ldif.in slapi-nis-0.8.5/doc/sch-plugin.ldif.in
+--- slapi-nis-0.8.5/doc/sch-plugin.ldif.in	2008-12-08 14:00:53.000000000 -0500
++++ slapi-nis-0.8.5/doc/sch-plugin.ldif.in	2008-12-09 11:18:21.000000000 -0500
+@@ -3,7 +3,7 @@
+ objectclass: nsSlapdPlugin
+ objectclass: extensibleObject
+ cn: Schema Compatibility
+-nsslapd-pluginpath: @myplugindir@/schemacompat-plugin.so
++nsslapd-pluginpath: schemacompat-plugin
+ nsslapd-plugininitfunc: schema_compat_plugin_init
+ nsslapd-plugintype: object
+ nsslapd-pluginenabled: on
diff --git a/slapi-nis.spec b/slapi-nis.spec
index e9c7875..3b87520 100644
--- a/slapi-nis.spec
+++ b/slapi-nis.spec
@@ -1,11 +1,12 @@
 Name:		slapi-nis
 Version:	0.8.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	NIS Server and Schema Compatibility plugins for Directory Server
 Group:		System Environment/Daemons
 License:	GPLv2
 URL:		http://slapi-nis.fedorahosted.org/
 Source0:	https://fedorahosted.org/releases/s/l/slapi-nis/slapi-nis-%{version}.tar.gz
+Patch0:		slapi-nis-paths.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	fedora-ds-base-devel, mozldap-devel, tcp_wrappers-devel
@@ -20,6 +21,7 @@ in the directory.
 
 %prep
 %setup -q
+%patch0 -p1 -b .paths
 
 %build
 %configure --disable-static --with-tcp-wrappers
@@ -46,6 +48,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/nisserver-plugin-defs
 
 %changelog
+* Tue Dec  9 2008 Nalin Dahyabhai <nalin@redhat.com> - 0.8.5-2
+- make the example nsslapd-pluginpath values the same on 32- and 64-bit
+  systems, because we can depend on the directory server "knowing" which
+  directory to search for the plugins
+
 * Mon Dec  8 2008 Nalin Dahyabhai <nalin@redhat.com> - 0.8.5-1
 - update to 0.8.5 to suppress duplicate values for attributes in the schema
   compatibility plugin