diff --git a/.cvsignore b/.cvsignore
index af02be3..4c89b30 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pcmciautils-014.tar.bz2
+pcmciautils-015.tar.bz2
diff --git a/pcmciautils-014-funcname.patch b/pcmciautils-014-funcname.patch
deleted file mode 100644
index 783834f..0000000
--- a/pcmciautils-014-funcname.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- pcmciautils-014/src/pccardctl.c~	2006-06-01 10:07:52.000000000 +0100
-+++ pcmciautils-014/src/pccardctl.c	2007-06-05 22:20:36.000000000 +0100
-@@ -37,6 +37,7 @@ static char *fn[] = {
- 	"AIMS",
- 	"SCSI"
- };
-+#define NR_FNS ( sizeof(fn) / sizeof(*fn) )
- 
- /* crc32hash.c - derived from linux/lib/crc32.c, GNU GPL v2 */
- static unsigned int crc32(unsigned char const *p, unsigned int len)
-@@ -219,7 +220,7 @@ static int pccardctl_ident(unsigned long
- 	char *prod_id[4];
- 	int valid_prod_id = 0;
- 	int i;
--	unsigned int manf_id, card_id;
-+	unsigned int manf_id, card_id, func_id;
- 
- 	if (!pccardctl_socket_exists(socket_no))
- 		return -ENODEV;
-@@ -249,9 +250,15 @@ static int pccardctl_ident(unsigned long
- 		if (!pccardctl_get_one(socket_no, "card_id", &card_id))
- 			printf("  manfid: 0x%04x, 0x%04x\n", manf_id, card_id);
- 
--	if (!pccardctl_get_one(socket_no, "func_id", &manf_id))
--		printf("  function: %d (%s)\n", manf_id, fn[manf_id]);
-+	if (!pccardctl_get_one(socket_no, "func_id", &func_id)) {
-+		char *func_name;
-+		if (func_id < NR_FNS)
-+			func_name = fn[func_id];
-+		else
-+			func_name = "unknown";
- 
-+		printf("  function: 0x%x (%s), %d\n", func_id, func_name, NR_FNS);
-+	}
- 
- 	return 0;
- }
diff --git a/pcmciautils-014-newrules.patch b/pcmciautils-014-newrules.patch
deleted file mode 100644
index c6e098b..0000000
--- a/pcmciautils-014-newrules.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -up pcmciautils-014/udev/rules-modprobe.newrule pcmciautils-014/udev/rules-modprobe
---- pcmciautils-014/udev/rules-modprobe.newrule	2006-06-01 11:07:52.000000000 +0200
-+++ pcmciautils-014/udev/rules-modprobe	2007-08-22 13:11:48.000000000 +0200
-@@ -1,3 +1,4 @@
-+### Already done by the general modprobe rule
- # modprobe $modalias loads all possibly appropriate modules
--ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
--		RUN+="/sbin/modprobe $modalias"
-+#ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
-+#		RUN+="/sbin/modprobe $env{MODALIAS}"
-diff -up pcmciautils-014/udev/rules-base.newrule pcmciautils-014/udev/rules-base
---- pcmciautils-014/udev/rules-base.newrule	2006-06-01 11:07:52.000000000 +0200
-+++ pcmciautils-014/udev/rules-base	2007-08-22 13:17:40.000000000 +0200
-@@ -3,13 +3,12 @@
- # are so broken that we need to read out random bytes of it
- # instead of the manufactor, card or product ID. Then the
- # matching is done in userspace.
--ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
-+ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
- 		RUN+="/sbin/pcmcia-check-broken-cis"
- 
- # However, the "weak" matching by func_id is only allowed _after_ modprobe
- # returns, so that "strong" matches have a higher priority.
--ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
--		RUN+="/bin/sh -c 'echo 1 > /sys/$devpath/allow_func_id_match'"
-+ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", ATTR{allow_func_id_match}="1"
- 
- # PCMCIA sockets:
- #
diff --git a/pcmciautils.spec b/pcmciautils.spec
index 94249db..ce4c971 100644
--- a/pcmciautils.spec
+++ b/pcmciautils.spec
@@ -1,10 +1,10 @@
 Name: pcmciautils
 Summary: PCMCIA utilities and initialization programs
 License: GPLv2
-Version: 014
-Release: 13%{?dist}
+Version: 015
+Release: 1%{?dist}
 Group: System Environment/Base
-ExclusiveArch: i386 x86_64 ia64 ppc ppc64 %{?arm}
+ExclusiveArch: i386 i586 x86_64 ia64 ppc ppc64 %{?arm}
 URL: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html
 Source: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-%{version}.tar.bz2
 Obsoletes: pcmcia-cs < 3.2.9
@@ -17,8 +17,6 @@ BuildRequires: libsysfs-devel >= 1.3.0
 Requires: udev >= 062, kernel >= 2.6.12-1.1411_FC5
 BuildRequires: byacc, flex
 Patch1: pcmciautils-fedora.patch
-Patch2: pcmciautils-014-newrules.patch
-Patch3: pcmciautils-014-funcname.patch
 
 %description
 The pcmciautils package contains utilities for initializing and
@@ -28,8 +26,6 @@ debugging PCMCIA and Cardbus sockets.
 %setup -q
 # Fix build peculiarities
 %patch1 -p1
-%patch2 -p1 -b .newrule
-%patch3 -p1
 
 %build
 make %{?_smp_mflags}
@@ -54,6 +50,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_mandir}/man*/pccardctl*
 
 %changelog
+* Fri Mar 06 2009 Harald Hoyer <harald@redhat.com> 015-1
+- version 015
+- added buildarch i586
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 014-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index 39bd4e8..25fff4c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3f07c926875f6c5dcb83240f39725177  pcmciautils-014.tar.bz2
+9e12435c8b6cf7bf59894e90e480b4aa  pcmciautils-015.tar.bz2