diff --git a/aalib-aclocal.patch b/aalib-aclocal.patch
new file mode 100644
index 0000000..17f2431
--- /dev/null
+++ b/aalib-aclocal.patch
@@ -0,0 +1,11 @@
+--- aalib.m4~	2001-04-26 17:37:31.000000000 +0300
++++ aalib.m4	2004-07-16 01:22:13.035644150 +0300
+@@ -9,7 +9,7 @@
+ dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+ dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_AALIB,
++AC_DEFUN([AM_PATH_AALIB],
+ [dnl 
+ dnl Get the cflags and libraries from the aalib-config script
+ dnl
diff --git a/aalib-config-rpath.patch b/aalib-config-rpath.patch
new file mode 100644
index 0000000..c045a40
--- /dev/null
+++ b/aalib-config-rpath.patch
@@ -0,0 +1,17 @@
+--- aalib-config.in~	2001-04-26 17:37:31.000000000 +0300
++++ aalib-config.in	2004-07-16 01:33:03.740515009 +0300
+@@ -48,12 +48,12 @@
+       echo -I@includedir@ @AALIB_CFLAGS@
+       ;;
+ @ENABLE_SHARED_TRUE@    --libs)
+-@ENABLE_SHARED_TRUE@      libdirs="-L@libdir@ @AALIB_RLD_FLAGS@"
++@ENABLE_SHARED_TRUE@      libdirs="-L@libdir@"
+ @ENABLE_SHARED_TRUE@      echo $libdirs @AALIB_LIBS@
+ @ENABLE_SHARED_TRUE@      ;;
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
+-@ENABLE_STATIC_TRUE@      libdirs="-L@libdir@ @AALIB_RLD_FLAGS@"
++@ENABLE_STATIC_TRUE@      libdirs="-L@libdir@"
+ @ENABLE_STATIC_TRUE@      echo $libdirs @AALIB_LIBS@ 
+ @ENABLE_STATIC_TRUE@      ;;
+     *)
diff --git a/aalib.spec b/aalib.spec
index 66709c6..64cd3ae 100644
--- a/aalib.spec
+++ b/aalib.spec
@@ -3,12 +3,14 @@
 Summary: 	An ASCII art library.
 Name: 		aalib
 Version: 	1.4.0
-Release: 	0.fdr.0.8.%{rc_subver}.1
+Release: 	0.fdr.0.9.%{rc_subver}.2
 Epoch:		0
 License: 	LGPL
 Group: 		System Environment/Libraries
 URL: 		http://aa-project.sourceforge.net/aalib/
-Source0: 	http://prdownloads.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz
+Source0: 	http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz
+Patch0:		%{name}-aclocal.patch
+Patch1:		%{name}-config-rpath.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	slang-devel XFree86-devel gpm-devel
 
@@ -16,8 +18,9 @@ BuildRequires:	slang-devel XFree86-devel gpm-devel
 Summary:	aalib development files
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires(post,postun):	info
 Requires:	XFree86-devel, slang-devel, gpm-devel
+Requires(post):	/sbin/install-info
+Requires(postun): /sbin/install-info
 
 
 %description
@@ -29,11 +32,13 @@ is designed to be similar to other graphics libraries.
 
 %description devel
 This package contains header files and other files needed to develop
-with the aalib
+with aalib.
 
 
 %prep
 %setup -q
+%patch0 -p0
+%patch1 -p0
 
 
 %build
@@ -43,12 +48,10 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
-# Just to be sure..
+make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT/%{_infodir}/dir 2>/dev/null
 
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -57,11 +60,12 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info %{_infodir}/libaa.info.gz %{_infodir}/dir 2>/dev/null || :
+/sbin/install-info %{_infodir}/libaa.info %{_infodir}/dir 2>/dev/null || :
 
 %preun devel
 if [ "$1" = "0" ]; then
-	/sbin/install-info --delete %{_infodir}/libaa.info.gz %{_infodir}/dir 2>/dev/null || :
+  /sbin/install-info --delete %{_infodir}/libaa.info %{_infodir}/dir \
+    2>/dev/null || :
 fi
 
 
@@ -87,6 +91,12 @@ fi
 %{_datadir}/aclocal/aalib.m4
 
 %changelog
+* Fri Jul 16 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.4.0-0.fdr.0.9.rc5
+- Fix underquoted definition in aalib.m4 to appease aclocal >= 1.8.
+- Avoid rpath in aalib-config.
+- Split Requires(post,postun) into two to work around a rpm bug.
+- Other minor specfile improvements.
+
 * Thu Aug 21 2003 Dams <anvil[AT]livna.org> 0:1.4.0-0.fdr.0.8.rc5
 - devel package now requires info
 - Rewrote scriplets