diff --git a/Makefile.am b/Makefile.am
index a4962194..d085ed55 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,13 +30,13 @@ EXTRA_DIST=vs7 \
            src/SAX/wrappers/saxexpat.cpp \
            src/SAX/wrappers/saxlibxml2.cpp \
            src/SAX/wrappers/saxxerces.cpp \
-           src/Utils/impl/codecvt_specialisations.cpp 
+           src/convert/impl/codecvt_specialisations.cpp 
 dist-hook:
 	find $(distdir) -print | grep \.svn | xargs rm -rf
 	find $(distdir) -print | grep \~$ | xargs rm -rf
 	rm $(distdir)/include/SAX/ArabicaConfig.hpp
 
-pkgconfigdir = src/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = arabica.pc
 
 docs:
diff --git a/configure.ac b/configure.ac
index 40011363..38e4728f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Arabica], [Aug2007], [jez@jezuk.co.uk])
+AC_INIT([Arabica], [Sept2007], [jez@jezuk.co.uk])
 
 AM_INIT_AUTOMAKE([1.9 tar-ustar])
  
diff --git a/tests/DOM/Makefile.am b/tests/DOM/Makefile.am
index 6973de79..24fef38d 100644
--- a/tests/DOM/Makefile.am
+++ b/tests/DOM/Makefile.am
@@ -11,16 +11,16 @@ LIBSILLY = ../CppUnit/libsillystring.la
 TESTLIBS = $(LIBARABICA) ../CppUnit/libcppunit.la
 
 test_sources = dom_test_suite.hpp \
-               test_Attribute.h \
+               test_Attribute.hpp \
                test_CDATA.hpp \
                test_CharacterData.hpp \
-               test_DOMImplementation.h \
-               test_Document.h \
-               test_DocumentFragment.h \
-               test_DocumentType.h \
-               test_Element.h \
-               test_ProcessingInstruction.h \
-               test_Siblings.h \
+               test_DOMImplementation.hpp \
+               test_Document.hpp \
+               test_DocumentFragment.hpp \
+               test_DocumentType.hpp \
+               test_Element.hpp \
+               test_ProcessingInstruction.hpp \
+               test_Siblings.hpp \
                test_Text.hpp \
                test_SAX2DOM.hpp \
                test_TreeWalker.hpp