diff --git a/libvorbis.spec b/libvorbis.spec
index 75122b3..30f2fa3 100644
--- a/libvorbis.spec
+++ b/libvorbis.spec
@@ -1,13 +1,13 @@
-Summary:	The Vorbis General Audio Compression Codec.
+Summary:	The Vorbis General Audio Compression Codec
 Name:		libvorbis
 Version:	1.3.3
-Release: 	2%{?dist}
+Release:	3%{?dist}
 Epoch:		1
 Group:		System Environment/Libraries
 License:	BSD
 URL:		http://www.xiph.org/
 Source:		http://downloads.xiph.org/releases/vorbis/%{name}-%{version}.tar.xz
-BuildRequires: 	libogg-devel >= 2:1.1
+BuildRequires:	libogg-devel >= 2:1.1
 Patch2:		libvorbis-1.2.3-add-needed.patch
 
 %description
@@ -19,7 +19,7 @@ The libvorbis package contains runtime libraries for use in programs
 that support Ogg Vorbis.
 
 %package devel
-Summary: Development tools for Vorbis applications.
+Summary: Development tools for Vorbis applications
 Group: Development/Libraries
 Requires:	libogg-devel >= 2:1.1
 Requires:	%{name} = %{epoch}:%{version}-%{release}
@@ -52,11 +52,14 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-install -t $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} AUTHORS COPYING README
-
+install -pm 644 -t $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} \
+    AUTHORS COPYING README
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+%check
+make check
+
 %files
 %defattr(-,root,root)
 %doc %dir %{_docdir}/%{name}-%{version}
@@ -76,8 +79,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %files devel-docs
 %defattr(-,root,root)
-%{_docdir}/%{name}-%{version}
+%{_docdir}/%{name}-%{version}/*
 %exclude %{_docdir}/%{name}-%{version}/COPYING
+%exclude %{_docdir}/%{name}-%{version}/doxygen-build.stamp
 
 %clean 
 rm -rf $RPM_BUILD_ROOT
@@ -87,6 +91,11 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sat Jul 21 2012 Ville Skyttä <ville.skytta@iki.fi> - 1:1.3.3-3
+- Run test suite during build.
+- Fix doc file permissions and duplicate doc dir ownership.
+- rpmlint warning fixes.
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.3.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
@@ -151,7 +160,7 @@ rm -rf $RPM_BUILD_ROOT
 - Autorebuild for GCC 4.3
 
 * Sun Oct 21 2007 Hans de Goede <j.w.r.degoede@hhs.nl> - 1:1.2.0-2
-- Don't include Makefile's in %doc, avoiding a multilib conflict (bz 342481)
+- Don't include Makefile's in %%doc, avoiding a multilib conflict (bz 342481)
 
 * Mon Oct 15 2007 Behdad Esfahbod <besfahbo@redhat.com> - 1:1.2.0-1
 - Update to 1.2.0
diff --git a/r16326.diff b/r16326.diff
deleted file mode 100644
index cacee99..0000000
--- a/r16326.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up libvorbis-1.2.3/lib/backends.h.r16326 libvorbis-1.2.3/lib/backends.h
---- libvorbis-1.2.3/lib/backends.h.r16326	2009-07-09 11:12:08.000000000 +0200
-+++ libvorbis-1.2.3/lib/backends.h	2009-11-02 14:55:42.000000000 +0100
-@@ -111,7 +111,7 @@ typedef struct vorbis_info_residue0{
-   int    partitions;       /* possible codebooks for a partition */
-   int    groupbook;        /* huffbook for partitioning */
-   int    secondstages[64]; /* expanded out to pointers in lookup */
--  int    booklist[256];    /* list of second stage books */
-+  int    booklist[512];    /* list of second stage books */
- 
-   const float classmetric1[64];
-   const float classmetric2[64];
diff --git a/r16597.diff b/r16597.diff
deleted file mode 100644
index 6f0a065..0000000
--- a/r16597.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up libvorbis-1.2.3/lib/codebook.c.r16597 libvorbis-1.2.3/lib/codebook.c
---- libvorbis-1.2.3/lib/codebook.c.r16597	2009-07-09 11:12:08.000000000 +0200
-+++ libvorbis-1.2.3/lib/codebook.c	2009-11-02 14:51:15.000000000 +0100
-@@ -198,6 +198,7 @@ int vorbis_staticbook_unpack(oggpack_buf
-       for(i=0;i<s->entries;){
-         long num=oggpack_read(opb,_ilog(s->entries-i));
-         if(num==-1)goto _eofout;
-+        if(length>32)goto _errout;
-         for(j=0;j<num && i<s->entries;j++,i++)
-           s->lengthlist[i]=length;
-         length++;