diff --git a/libaio-optflags.diff b/libaio-optflags.diff
new file mode 100644
index 0000000..f4a0914
--- /dev/null
+++ b/libaio-optflags.diff
@@ -0,0 +1,11 @@
+--- libaio-0.3.104/src/Makefile	2007/08/02 10:44:05	1.1
++++ libaio-0.3.104/src/Makefile	2007/08/02 10:44:31
+@@ -3,7 +3,7 @@
+ libdir=$(prefix)/lib
+ 
+ ARCH := $(shell uname -m | sed -e s/i.86/i386/)
+-CFLAGS := -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC
++CFLAGS := -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC $(OPTFLAGS)
+ SO_CFLAGS=-shared $(CFLAGS)
+ L_CFLAGS=$(CFLAGS)
+ LINK_FLAGS=
diff --git a/libaio.changes b/libaio.changes
index 17385b9..49b0bbe 100644
--- a/libaio.changes
+++ b/libaio.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Aug  2 12:50:35 CEST 2007 - hare@suse.de
+
+- Use RPM_OPT_FLAGS
+- Fix installation directories
+
 -------------------------------------------------------------------
 Wed Jan 25 21:37:22 CET 2006 - mls@suse.de
 
diff --git a/libaio.spec b/libaio.spec
index 96103dd..fb31112 100644
--- a/libaio.spec
+++ b/libaio.spec
@@ -1,40 +1,41 @@
 #
 # spec file for package libaio (Version 0.3.104)
 #
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
 
-Name:         libaio
-License:      LGPL
-Group:        System/Libraries
-Autoreqprov:  on
-Version:      0.3.104
-Release:      2
-Summary:      Linux-Native Asynchronous I/O access Library
-Source:       libaio-%{version}.tar.bz2
-Patch:        libaio-%{version}.diff
-BuildRoot:    %{_tmppath}/%{name}-%{version}-build
+Name:           libaio
+License:        LGPL v2 or later
+Group:          System/Libraries
+Autoreqprov:    on
+Version:        0.3.104
+Release:        64
+Summary:        Linux-Native Asynchronous I/O Access Library
+Source:         libaio-%{version}.tar.bz2
+Patch1:         libaio-%{version}.diff
+Patch2:         libaio-optflags.diff
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 The Linux-native asynchronous I/O facility ("async I/O", or "aio") has
 a richer API and capability set than the simple POSIX async I/O
 facility. This library provides the Linux-native API for async I/O. The
 POSIX async I/O facility requires this library to provide
-kernel-accelerated async I/O capabilities, as do applications which
+kernel-accelerated async I/O capabilities, as do applications that
 require the Linux-native async I/O API.
 
 
 
 %package devel
-Summary:      Development Files for Linux-native Asynchronous I/O Access
-Group:        Development/Libraries/C and C++
-Requires:     libaio = %{version}
+Summary:        Development Files for Linux-native Asynchronous I/O Access
+Group:          Development/Libraries/C and C++
+Requires:       libaio = %{version}
 
 %description devel
 This package provides header files to include, and libraries to link
@@ -45,13 +46,17 @@ with, for the Linux-native asynchronous I/O facility ("async I/O", or
 
 %prep
 %setup -q
-%patch
+%patch1
+%patch2 -p1
 
 %build
-make
+make OPTFLAGS="$RPM_OPT_FLAGS"
 
 %install
-make install prefix=$RPM_BUILD_ROOT/usr libdir=$RPM_BUILD_ROOT%{_libdir}
+make install prefix=%{buildroot}/usr libdir=%{buildroot}/%{_lib}
+mkdir -p %{buildroot}%{_libdir}
+mv %{buildroot}/%{_lib}/libaio.a %{buildroot}%{_libdir}/libaio.a
+mv %{buildroot}/%{_lib}/libaio.so %{buildroot}%{_libdir}/libaio.so
 
 %post -p /sbin/ldconfig
 
@@ -60,8 +65,7 @@ make install prefix=$RPM_BUILD_ROOT/usr libdir=$RPM_BUILD_ROOT%{_libdir}
 %files
 %defattr(644,root,root,755)
 %doc COPYING TODO
-%attr(0755,root,root) %_libdir/libaio.so.1
-%attr(0755,root,root) %_libdir/libaio.so.1.0.1
+%attr(0755,root,root) /%{_lib}/libaio.*
 
 %files devel
 %defattr(644,root,root,755)
@@ -69,7 +73,10 @@ make install prefix=$RPM_BUILD_ROOT/usr libdir=$RPM_BUILD_ROOT%{_libdir}
 %_libdir/libaio.a
 %_libdir/libaio.so
 
-%changelog -n libaio
+%changelog
+* Thu Aug 02 2007 - hare@suse.de
+- Use RPM_OPT_FLAGS
+- Fix installation directories
 * Wed Jan 25 2006 - mls@suse.de
 - converted neededforbuild to BuildRequires
 * Thu May 05 2005 - schwab@suse.de