diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 427eb90..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: diveintopython
-# $Id$
-NAME := diveintopython
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/diveintopython.spec b/diveintopython.spec
index 18c9d53..3fc4afc 100644
--- a/diveintopython.spec
+++ b/diveintopython.spec
@@ -1,6 +1,6 @@
 Name:           diveintopython
 Version:        5.4
-Release:        12%{?dist}
+Release:        14%{?dist}
 
 Summary:        Dive into Python - a python book
 
@@ -76,7 +76,7 @@ rm -rf txt/*.html
 #install the files
 find . -type d -exec mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/'{}'  \;
 for DIR in * ; do
-  find $DIR -type f -exec install -m 0644 '{}' $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/${DIR}/ \;
+  find $DIR -type f -exec install -D -m 0644 '{}' $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/'{}' \;
 done
 popd
 
@@ -98,23 +98,33 @@ rm -rf $RPM_BUILD_ROOT
 
 %files html
 %defattr(-,root,root,-)
+%dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/html
 
 %files pdf
 %defattr(-,root,root,-)
+%dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/pdf
 %{_datadir}/applications/fedora-diveintopython.desktop
 
 %files single-html
 %defattr(-,root,root,-)
+%dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/htmlflat
 
 %files txt
 %defattr(-,root,root,-)
+%dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/txt
 
 
 %changelog
+* Tue Nov  4 2008 Paul W. Frields <stickster@gmail.com> - 5.4-14
+- Fix file location problem that breaks HTML version
+
+* Tue Sep  2 2008 Michael Schwendt <mschwendt@fedoraproject.org> - 5.4-13
+- Include /usr/share/doc/diveintopython-5.4 directory (in all pkgs)
+
 * Tue Feb 5 2008 Marc Wiriadisastra <marc@mwiriadi.id.au> - 5.4-12
 - Removed specific java package's and just use java in BR (overholt)
 - Added build_patch to not use downloaded jars and....