diff --git a/bind-9.11-export-isc-config.patch b/bind-9.11-export-isc-config.patch
deleted file mode 100644
index fd5622c..0000000
--- a/bind-9.11-export-isc-config.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/export-libs/Makefile b/export-libs/Makefile
-index df15ea8..13f416b 100644
---- a/export-libs/Makefile
-+++ b/export-libs/Makefile
-@@ -404,20 +404,18 @@ installdirs:
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
- 
- install:: isc-config.sh installdirs
--	${INSTALL_SCRIPT} isc-config.sh ${DESTDIR}${bindir}
--	rm -f ${DESTDIR}${bindir}/bind9-config
--	ln ${DESTDIR}${bindir}/isc-config.sh ${DESTDIR}${bindir}/bind9-config
--	${INSTALL_DATA} ${top_srcdir}/isc-config.sh.1 ${DESTDIR}${mandir}/man1
--	rm -f ${DESTDIR}${mandir}/man1/bind9-config.1
--	ln ${DESTDIR}${mandir}/man1/isc-config.sh.1 ${DESTDIR}${mandir}/man1/bind9-config.1
--	${INSTALL_DATA} ${top_srcdir}/bind.keys ${DESTDIR}${sysconfdir}
-+	${INSTALL_SCRIPT} isc-config.sh ${DESTDIR}${bindir}/isc-export-config.sh
-+	rm -f ${DESTDIR}${bindir}/bind9-export-config
-+	ln ${DESTDIR}${bindir}/isc-export-config.sh ${DESTDIR}${bindir}/bind9-export-config
-+	${INSTALL_DATA} ${top_srcdir}/isc-config.sh.1 ${DESTDIR}${mandir}/man1/isc-export-config.sh.1
-+	rm -f ${DESTDIR}${mandir}/man1/bind9-export-config.1
-+	ln ${DESTDIR}${mandir}/man1/isc-export-config.sh.1 ${DESTDIR}${mandir}/man1/bind9-export-config.1
- 
- uninstall::
--	rm -f ${DESTDIR}${sysconfdir}/bind.keys
--	rm -f ${DESTDIR}${mandir}/man1/bind9-config.1
--	rm -f ${DESTDIR}${mandir}/man1/isc-config.sh.1
--	rm -f ${DESTDIR}${bindir}/bind9-config
--	rm -f ${DESTDIR}${bindir}/isc-config.sh
-+	rm -f ${DESTDIR}${mandir}/man1/bind9-export-config.1
-+	rm -f ${DESTDIR}${mandir}/man1/isc-export-config.sh.1
-+	rm -f ${DESTDIR}${bindir}/bind9-export-config
-+	rm -f ${DESTDIR}${bindir}/isc-export-config.sh
- 
- tags:
- 	rm -f TAGS
diff --git a/bind.spec b/bind.spec
index 1424b3b..5c76151 100644
--- a/bind.spec
+++ b/bind.spec
@@ -124,9 +124,6 @@ Patch159:bind-9.11-rt46047.patch
 Patch11: bind-9.3.2b2-sdbsrc.patch
 Patch12: bind-9.10-sdb.patch
 
-# export lib patches
-Patch135:bind-9.11-export-isc-config.patch
-
 # needs inpection
 Patch17: bind-9.3.2b1-fix_sdb_ldap.patch
 
@@ -637,6 +634,8 @@ popd # build
 %systemtest_prepare_build build
 
 %if %{with EXPORT_LIBS}
+cp isc-config.sh.1 isc-export-config.sh.1
+
 ## Create export libs ##
 mkdir -p export-libs
 pushd export-libs
@@ -673,8 +672,12 @@ export LIBDIR_SUFFIX
 ## FIXME this should be in patch instead of SED'ing
 ## but do we really like/want to patch generated files?
 
-sed -i -e \
-'/^SUBDIRS =/s/.*/SUBDIRS = make lib/i' \
+mv isc-config.sh isc-export-config.sh
+
+sed -i \
+-e '/^SUBDIRS =/s/.*/SUBDIRS = make lib/i' \
+-e 's/isc-config.sh/isc-export-config.sh/g' \
+-e 's/bind9-config/bind9-export-config/g' \
 Makefile
 
 sed -i -e \
@@ -690,9 +693,9 @@ do
         find .  -name Makefile -exec sed  "s/lib${lib}\./lib${lib}-export\./g" -i {} \;
         sed -e "s/-l${lib}\([^[:alpha:]]\)/-l${lib}-export\1/g" \
             -e "s/lib${lib}\./lib${lib}-export\./g" \
-            -i isc-config.sh
+            -i isc-export-config.sh
 done;
-%{__patch} -p2 -b --suffix .export-isc-config < %{PATCH135}
+
 make %{?_smp_mflags}
 popd