diff --git a/autogen-multilib.patch b/autogen-multilib.patch
index f5a8eb2..4113b36 100644
--- a/autogen-multilib.patch
+++ b/autogen-multilib.patch
@@ -23,28 +23,3 @@ diff -up autogen-5.18/autoopts/autoopts-config.in.multilib autogen-5.18/autoopts
        cflags="-I${includedir}"
  test 'X@ENABLE_STATIC@' = Xno && static_libs=''
  case "${libdir}" in
-diff -up autogen-5.18/autoopts/mk-autoopts-pc.in.multilib autogen-5.18/autoopts/mk-autoopts-pc.in
---- autogen-5.18/autoopts/mk-autoopts-pc.in.multilib	2013-07-15 02:37:20.000000000 +0200
-+++ autogen-5.18/autoopts/mk-autoopts-pc.in	2013-07-29 15:49:20.603890010 +0200
-@@ -17,17 +17,17 @@
-   includedir="@includedir@"
-  exec_prefix="@exec_prefix@"
-       bindir="@bindir@"
--      libdir="@libdir@"
--      ldopts="@AG_LDFLAGS@"
-+      libdir=""
-+      ldopts=""
-       exeext="@EXEEXT@"
-      version="@AO_CURRENT@:@AO_REVISION@:@AO_AGE@"
-       dotver="@AO_CURRENT@.@AO_REVISION@.@AO_AGE@"
-   pkgdatadir="${datadir}/${package}"
-      autogen="${bindir}/autogen${exeext}"
--     ldflags="-L${libdir} -lopts"
-+     ldflags="-lopts"
-         libs="${ldflags}"
-       libsrc="${pkgdatadir}/libopts-${dotver}.tar.gz"
-- static_libs="${libdir}/libopts.a"
-+ static_libs=""
-       cflags="-I${includedir}"
- test 'X@ENABLE_STATIC@' = Xno && static_libs=''
- case "${libdir}" in
diff --git a/autogen.spec b/autogen.spec
index 2799a01..0b2e240 100644
--- a/autogen.spec
+++ b/autogen.spec
@@ -1,6 +1,6 @@
 Summary:	Automated text file generator
 Name:		autogen
-Version:	5.18.4
+Version:	5.18.5
 Release:	1%{?dist}
 # Some files are licensed under GPLv2+.
 # We redistribute them under GPLv3+.
@@ -119,21 +119,22 @@ fi
 %{_mandir}/man1/columns.1.gz
 %{_mandir}/man1/getdefs.1.gz
 %{_mandir}/man1/xml2ag.1.gz
-
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/*
 
 %files libopts
 %doc pkg/libopts/COPYING.mbsd
 %doc pkg/libopts/COPYING.lgplv3
-%{_libdir}/libopts.so.*
+%{_libdir}/libopts.so.25*
 
 %files libopts-devel
 %{_bindir}/autoopts-config
 %{_datadir}/aclocal/autoopts.m4
 #%{_datadir}/aclocal/liboptschk.m4
 %{_libdir}/libopts.so
-%{_datadir}/pkgconfig/autoopts.pc
+%{_libdir}/pkgconfig/autoopts.pc
 %{_mandir}/man1/autoopts-config.1.gz
 %{_mandir}/man3/*