diff --git a/libyaml.spec b/libyaml.spec
index 0b15c8a..c32f063 100644
--- a/libyaml.spec
+++ b/libyaml.spec
@@ -1,13 +1,17 @@
-Name:           libyaml
-Version:        0.1.2
-Release:        3%{?dist}
-Summary:        YAML 1.1 parser and emitter written in C
+%define tarballname yaml
 
-Group:          Development/Libraries
-License:        MIT
-URL:            http://pyyaml.org/
-Source0:        http://pyyaml.org/download/libyaml/yaml-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#====================================================================#
+
+Name:       libyaml
+Version:    0.1.2
+Release:    4%{?dist}
+Summary:    YAML 1.1 parser and emitter written in C
+
+Group:      System Environment/Libraries
+License:    MIT
+URL:        http://pyyaml.org/
+Source0:    http://pyyaml.org/download/libyaml/%{tarballname}-%{version}.tar.gz
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 %description
@@ -17,17 +21,18 @@ emitter written in C.
 
 
 %package devel
-Summary:        Development libraries and headers for developing LibYAML applications
-Group:          Development/Libraries
-Requires:       libyaml = %{version}-%{release}
+Summary:   Development files for LibYAML applications
+Group:     Development/Libraries
+Requires:  libyaml = %{version}-%{release}
 
 
 %description devel
-Development libraries and headers for developing LibYAML applications.
+The %{name}-devel package contains libraries and header files for
+developing applications that use LibYAML.
 
 
 %prep
-%setup -q -n yaml-%{version}
+%setup -q -n %{tarballname}-%{version}
 
 
 %build
@@ -40,6 +45,11 @@ rm -rf %{buildroot}
 make DESTDIR=%{buildroot} INSTALL="install -p" install
 rm -f %{buildroot}%{_libdir}/*.{la,a}
 
+
+%check
+make check
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -52,7 +62,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc README LICENSE
+%doc LICENSE README
 %{_libdir}/%{name}*.so.*
 
 
@@ -64,6 +74,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jul 22 2009 John Eckersberg <jeckersb@redhat.com> - 0.1.2-4
+- Minor tweaks to spec file
+- Enable %%check section
+- Thanks Gareth Armstrong <gareth.armstrong@hp.com>
+
 * Tue Mar 3 2009 John Eckersberg <jeckersb@redhat.com> - 0.1.2-3
 - Remove static libraries