diff --git a/.cvsignore b/.cvsignore
index b9edc82..eafc62a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libksba-0.4.7.tar.gz
+libksba-0.9.9.tar.gz
diff --git a/libksba-0.9.9-underquoted.patch b/libksba-0.9.9-underquoted.patch
new file mode 100644
index 0000000..65255bf
--- /dev/null
+++ b/libksba-0.9.9-underquoted.patch
@@ -0,0 +1,12 @@
+diff -Nur libksba-0.9.9-orig/src/ksba.m4 libksba-0.9.9/src/ksba.m4
+--- libksba-0.9.9-orig/src/ksba.m4	2002-08-23 20:53:24.000000000 +0200
++++ libksba-0.9.9/src/ksba.m4	2005-02-01 20:15:20.041030328 +0100
+@@ -14,7 +14,7 @@
+ dnl              [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+ dnl Test for libksba and define KSBA_CFLAGS and KSBA_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_KSBA,
++AC_DEFUN([AM_PATH_KSBA],
+ [ AC_ARG_WITH(ksba-prefix,
+             AC_HELP_STRING([--with-ksba-prefix=PFX],
+                            [prefix where KSBA is installed (optional)]),
diff --git a/libksba-0.9.9.tar.gz.sig b/libksba-0.9.9.tar.gz.sig
new file mode 100644
index 0000000..1c11655
Binary files /dev/null and b/libksba-0.9.9.tar.gz.sig differ
diff --git a/libksba.spec b/libksba.spec
index aa31b0a..255155b 100644
--- a/libksba.spec
+++ b/libksba.spec
@@ -1,40 +1,53 @@
-Summary:        X.509 library
-Name:           libksba
-Version:        0.4.7
-Release:        1
-License:        GPL
-Group:          System Environment/Libraries
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-URL:            http://www.gnupg.org/
-Source0:        http://ftp.gnupg.org/gcrypt/alpha/aegypten/libksba-0.4.7.tar.gz
-Epoch:          0
+
+Summary: X.509 library
+Name:  	 libksba 
+Epoch: 	 0
+Version: 0.9.9
+Release: 1%{?dist_tag}
+License: GPL
+Group:   System Environment/Libraries
+URL:     http://www.gnupg.org/
+Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libksba/libksba-0.9.9.tar.gz
+Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libksba/libksba-0.9.9.tar.gz.sig
+Patch0:  libksba-0.9.9-underquoted.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: libgpg-error >= 0:0.7
+BuildRequires: libgcrypt-devel >= 0:1.2.0
 
 %description
 KSBA is a library designed to build software based on the X.509 and
 CMS protocols.
 
 %package devel
-Summary:        Development headers and libraries for %{name}
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-
+Summary:  Development headers and libraries for %{name}
+Group:    Development/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 %description devel
 Development headers and libraries for %{name}.
 
 
 %prep
 %setup -q
+%patch -p1 -b .underquoted
 
 
 %build
 %configure
-make %{?_smp_mflags}
+
+# not smp safe
+make 
+
 make check
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
+
 rm -f $RPM_BUILD_ROOT{%{_infodir}/dir,%{_libdir}/*.la}
 
 
@@ -43,15 +56,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 %post devel
-install-info %{_infodir}/ksba.info.gz %{_infodir}/dir
+install-info %{_infodir}/ksba.info.gz %{_infodir}/dir ||:
 
 %postun devel
-if [ "$1" = "0" ]; then
-  install-info --delete %{_infodir}/ksba.info.gz %{_infodir}/dir
+if [ $1 -eq 0 ]; then
+  install-info --delete %{_infodir}/ksba.info.gz %{_infodir}/dir ||:
 fi
 
 
@@ -71,6 +83,12 @@ fi
 
 
 %changelog
+* Tue Feb  1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:0.9.9-1
+- Minus BR libtool, add epoch to -devel req, fix underquoted ksba.m4.
+
+* Tue Oct 19 2004 Rex Dieter <rexdieter[AT]users.sf.net> 0:0.9.9-0.fdr.1
+- 0.9.9
+
 * Thu Mar 20 2003 Ville Skytt� <ville.skytta at iki.fi> - 0.4.7-0.fdr.1
 - Update to 0.4.7, and to current Fedora guidelines.
 - Exclude %%{_libdir}/*.la.
diff --git a/sources b/sources
index 6b12085..d525395 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-65ab8dad1f7fb379f72e1d096657a3d7  libksba-0.4.7.tar.gz
+49085f4435e7506c790ae23342b01b37  libksba-0.9.9.tar.gz