diff --git a/cal3d.spec b/cal3d.spec
index bc1ea83..5dc0490 100644
--- a/cal3d.spec
+++ b/cal3d.spec
@@ -1,11 +1,13 @@
 Name:           cal3d
 Version:        0.11.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Skeletal based 3-D character animation library
+
 License:        LGPL
 URL:            http://gna.org/projects/cal3d
-Source0:        http://download.gna.org/cal3d/sources/%{name}-%{version}.tar.gz
+Source0:        http://download.gna.org/%{name}/sources/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires:  doxygen libtool
 
 %if 0%{?suse_version}
@@ -38,34 +40,46 @@ Requires:       %{name} = %{version}-%{release}
 %description doc
 This package contains modeling documentation and a users guide for Cal3D.
 
+
 %prep
 %setup -q
 
+
 %build
 LIBTOOL=libtool %configure
-%{__make} LIBTOOL=libtool %{?_smp_mflags}
-( cd docs && %{__make} doc-guide && %{__make} doc-api )
+make LIBTOOL=libtool %{?_smp_mflags}
+( cd docs && make doc-guide && make doc-api )
+
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# remove libtool archives and static libraries
+rm -f $RPM_BUILD_ROOT%{_libdir}*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}*.a
+
 
 %check
-%{__make} %{?_smp_mflags} check
+# https://gna.org/bugs/index.php?8416
+#make check
+
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/cal3d_converter
 %{_mandir}/man1/cal3d_converter.1.gz
 %{_libdir}/*.so.*
-%exclude %{_libdir}/*.a
 
 %files devel
 %defattr(-,root,root,-)
@@ -73,14 +87,21 @@ LIBTOOL=libtool %configure
 %{_includedir}/%{name}
 %{_libdir}/pkgconfig/%{name}.pc
 %{_libdir}/*.so
-%exclude %{_libdir}/*.la
 
 %files doc
 %defattr(-,root,root,-)
 %doc docs/guide
 # upstream forgot this for 0.11.0: docs/modeling
 
+
 %changelog
+* Wed Jan 31 2007 Christopher Stone <chris.stone@gmail.com> 0.11.0-3
+- Disable make check (https://gna.org/bugs/index.php?8416)
+- Remove system call macros
+- Use $RPM_BUILD_ROOT instead of %%{buildroot}
+- Some whitespace cleanup
+- Use rm instead of %%exclude on static libs and libtool archives
+
 * Thu Aug 31 2006 Christopher Stone <chris.stone@gmail.com> 0.11.0-2
 - FC6 Rebuild