diff --git a/.cvsignore b/.cvsignore
index f8b4a78..fb7834c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 openjpeg_v1_3.tar.gz
+j2kp4files_v1_5.zip
diff --git a/openjpeg.spec b/openjpeg.spec
index 46e6eef..8c000f3 100644
--- a/openjpeg.spec
+++ b/openjpeg.spec
@@ -3,7 +3,7 @@
 
 Name:    openjpeg
 Version: 1.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: JPEG 2000 command line tools
 
 Group:     Applications/Multimedia
@@ -11,11 +11,14 @@ License:   BSD
 URL:       http://www.openjpeg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://www.openjpeg.org/openjpeg_v1_3.tar.gz
+Source1: http://www.crc.ricoh.com/~gormish/jpeg2000conformance/j2kp4files_v1_5.zip
+
 BuildRequires: cmake
 BuildRequires: libtiff-devel
 BuildRequires: recode
 
-Source0: http://www.openjpeg.org/openjpeg_v1_3.tar.gz
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 Patch1: openjpeg-20070717svn-codec-libtiff.patch
 Patch4: openjpeg-svn480-cmake.patch
@@ -42,24 +45,22 @@ developed in order to promote the use of JPEG 2000, the new still-image
 compression standard from the Joint Photographic Experts Group (JPEG).
 
 %package libs
-Summary: JPEG 2000 codec library
+Summary: JPEG 2000 codec runtime library
 Group:   System Environment/Libraries
-
 %description libs
-The openjpeg-libs package contains runtime libraries for applications that use
+The %{name}-libs package contains runtime libraries for applications that use
 OpenJPEG.
 
 %package  devel
-Summary:  Development files for openjpeg
+Summary:  Development files for %{name} 
 Group:    Development/Libraries
-Requires: openjpeg-libs = %{version}-%{release}
-
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %description devel
-The openjpeg-devel package contains libraries and header files for
+The %{name}-devel package contains libraries and header files for
 developing applications that use OpenJPEG.
 
 %prep
-%setup -q -n OpenJPEG_v1_3
+%setup -q -n OpenJPEG_v1_3 -a 1
 # Windows stuff, delete it, it slows down patch making
 rm -rf jp3d
 # Make sure we use system libraries
@@ -86,18 +87,23 @@ find . -type f -print0 | xargs -0 chmod a-x
 # fix charset
 recode latin1..utf8 ChangeLog
 
+
 %build
-mkdir build
-pushd build
-%cmake .. -DBUILD_EXAMPLES:BOOL=ON
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%cmake \
+  -DBUILD_EXAMPLES:BOOL=ON \
+  -DBUILD_SHARED_LIBS:BOOL=ON \
+  -DJPEG2000_CONFORMANCE_DATA_ROOT:PATH=../J2KP4files/ \
+   ..
 popd
 
-make %{?_smp_mflags} -C build
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
-make install/fast DESTDIR="%{buildroot}" -C build
+make install/fast DESTDIR="%{buildroot}" -C %{_target_platform}
 
 # HACK: until pkg-config support lands, temporarily provide
 # openjpeg.h header in legacy location
@@ -105,19 +111,23 @@ ln -s openjpeg/openjpeg.h %{buildroot}%{_includedir}/openjpeg.h
 
 
 %check
-# mostly pointless without test images, but it's a start -- Rex
-make test -C build
+## known failure (on rex's f13/x86_64 box anyway)
+#The following tests FAILED:
+#         24 - j2i-p0_07.j2k (SEGFAULT)
+make test -C %{_target_platform} ||:
+
 
 %clean
 rm -rf %{buildroot}
 
+
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog license.txt
 %{_bindir}/extract_j2k_from_mj2
 %{_bindir}/frames_to_mj2
 %{_bindir}/image_to_j2k
@@ -127,6 +137,7 @@ rm -rf %{buildroot}
 
 %files libs
 %defattr(-,root,root,-)
+%doc ChangeLog license.txt
 %{_libdir}/libopenjpeg.so.2*
 
 %files devel
@@ -135,7 +146,14 @@ rm -rf %{buildroot}
 %{_includedir}/openjpeg/
 %{_libdir}/libopenjpeg.so
 
+
 %changelog
+* Wed Jul 07 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.3-9
+- include test samples, enable tests
+- tighten subpkg deps
+- explicitly set/use -DBUILD_SHARED_LIBS:BOOL=ON
+- move %%doc files to -libs
+
 * Wed Feb 17 2010 Adam Goode <adam@spicenitz.org> - 1.3-8
 - Fix typo in description
 - Fix charset of ChangeLog (rpmlint)
diff --git a/sources b/sources
index ac23086..e16a9eb 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 f9a3ccfa91ac34b589e9bf7577ce8ff9  openjpeg_v1_3.tar.gz
+27780ed3254e6eb763ebd718a8ccc340  j2kp4files_v1_5.zip