diff --git a/libavc1394-0.4.1-kill-configure-insanity.patch b/libavc1394-0.4.1-kill-configure-insanity.patch
deleted file mode 100644
index 65af1e9..0000000
--- a/libavc1394-0.4.1-kill-configure-insanity.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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 91a05c2..74c98a3 100644
--- a/libavc1394.spec
+++ b/libavc1394.spec
@@ -1,16 +1,16 @@
-Summary: Audio/Video Control library for IEEE-1394 devices
-Name: libavc1394
-Version: 0.5.3
-Release: 5%{?dist}
-License: LGPLv2+
-Group: System Environment/Libraries
-Source: http://dl.sourceforge.net/libavc1394/libavc1394-%{version}.tar.gz
-Patch: libavc1394-0.5.1-librom.patch
-BuildRequires: libraw1394-devel
-BuildRequires: autoconf automake libtool
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-ExcludeArch: s390 s390x
-Obsoletes: libavc1394_0 <= %{version}-%{release}, librpm1394_0 <= %{version}-%{release}
+Summary:        Audio/Video Control library for IEEE-1394 devices
+Name:           libavc1394
+Version:        0.5.3
+Release:        6%{?dist}
+License:        GPLv2+ and LGPLv2+
+Group:          System Environment/Libraries
+URL:            http://sourceforge.net/projects/libavc1394/
+Source:         http://downloads.sourceforge.net/libavc1394/libavc1394-%{version}.tar.gz
+Patch1:         libavc1394-0.5.1-librom.patch
+BuildRequires:  libraw1394-devel
+BuildRequires:  autoconf automake libtool
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+ExcludeArch:    s390 s390x
 
 %description
 The libavc1394 library allows utilities to control IEEE-1394 devices
@@ -21,26 +21,27 @@ to control devices like the tape on a VCR or camcorder.
 Summary: Development libs for libavc1394
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libraw1394-devel
+Requires: libraw1394-devel, pkgconfig
 
 %description devel
 Development libraries required to build applications using libavc1394.
 
 %prep
 %setup -q
-%patch -p1 -b .librom
+%patch1 -p1 -b .librom
+chmod -x test/dvcont.c
 
 %build
-# Rerun autotools to pick up newer libtool
+# Rerun autotools to pick up newer libtool w/o hard-coded rpaths
 autoreconf -f -i
 %configure
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+make install INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT
+# sigh, --disable-static doesn't work
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.{la,a}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -51,15 +52,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING NEWS README ChangeLog
+%doc AUTHORS COPYING NEWS README ChangeLog TODO
+# binaries are GPLv2+
 %{_bindir}/dvcont
 %{_bindir}/mkrfc2734
 %{_bindir}/panelctl
-%{_libdir}/libavc1394.so.*
-%{_libdir}/librom1394.so.*
 %{_mandir}/man1/dvcont.1.gz
 %{_mandir}/man1/panelctl.1.gz
 %{_mandir}/man1/mkrfc2734.1*
+# libs are LGPLv2+
+%{_libdir}/libavc1394.so.*
+%{_libdir}/librom1394.so.*
 
 
 %files devel
@@ -71,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon May 18 2009 Jarod Wilson <jarod@redhat.com> 0.5.3-6
+- Fix up merge review issues (#225988)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild