diff --git a/libavc1394-0.4.1-kill-configure-insanity.patch b/libavc1394-0.4.1-kill-configure-insanity.patch
new file mode 100644
index 0000000..65af1e9
--- /dev/null
+++ b/libavc1394-0.4.1-kill-configure-insanity.patch
@@ -0,0 +1,13 @@
+--- configure.in~	2002-09-27 01:07:53.000000000 -0400
++++ configure.in	2005-01-03 15:09:26.310466248 -0500
+@@ -28,10 +28,5 @@
+ 
+ CFLAGS="$CFLAGS -Wall -Wunused"
+ 
+-Xsed="sed -e s/^X//"
+-LTLIBOBJS=`echo X"$LIBOBJS"|\
+-           [$Xsed -e "s,\.[^.]* ,.lo ,g;s,\.[^.]*$,.lo,"]`
+-AC_SUBST(LTLIBOBJS)
+-
+ AC_OUTPUT(Makefile common/Makefile libavc1394/Makefile librom1394/Makefile test/Makefile)
+ 
diff --git a/libavc1394.spec b/libavc1394.spec
index 1ced33c..b638f8a 100644
--- a/libavc1394.spec
+++ b/libavc1394.spec
@@ -1,13 +1,15 @@
 Summary: Audio/Video Control library for IEEE-1394 devices
 Name: libavc1394
-Version: 0.5.1
-Release: 1.fc5
+Version: 0.4.1
+Release: 9
 License: GPL
 Group: System Environment/Libraries
 Source: http://dl.sourceforge.net/libavc1394/libavc1394-%{version}.tar.gz
 BuildRequires: libraw1394-devel
-BuildRequires: libtool
+BuildRequires: autoconf automake libtool
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Patch1: libavc1394-0.4.1-kill-configure-insanity.patch
+Patch2: libavc1394-librom.patch
 ExcludeArch: s390 s390x
 
 %description
@@ -26,6 +28,8 @@ Development libraries required to build applications using libavc1394.
 
 %prep
 %setup -q
+%patch1 -p0 -b .kill-configure-insanity
+%patch2 -p1
 
 %build
 # Rerun autotools to pick up newer libtool
@@ -65,8 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Jul 22 2005 Warren Togami <wtogami@redhat.com> - 0.5.1-1
-- 0.5.1
+* Sat Oct 15 2005 Florian La Roche <laroche@redhat.com>
+- make sure librom1394 is linked to libraw1394 and also
+  libavc1394 is linked to librom1394 (also bz 156938)
 
 * Wed Mar 16 2005 Elliot Lee <sopwith@redhat.com>
 - rebuilt