diff --git a/COPYING b/COPYING
new file mode 120000
index 0000000..0b6cbf8
--- /dev/null
+++ b/COPYING
@@ -0,0 +1 @@
+/usr/share/automake-1.10/COPYING
\ No newline at end of file
diff --git a/INSTALL b/INSTALL
new file mode 120000
index 0000000..5bb6e7b
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1 @@
+/usr/share/automake-1.10/INSTALL
\ No newline at end of file
diff --git a/configure.in b/configure.in
index cd635df..931dd07 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 # init
 AC_INIT([README])
-PACKAGENAME=libxml++
+PACKAGENAME=libxml-cxx
 SRC_DIR=src
 TST_DIR=test
 DOC_DIR=doc
@@ -12,7 +12,7 @@ AM_INIT_AUTOMAKE(@PACKAGENAME@, @MAJOR@.@MINOR@.@LEAST@, [marc@waeckerlin.org])
 
 # files to create
 AC_CONFIG_FILES(makefile
-                src/makefile src/qmake.pro src/languages.qrc
+                src/makefile test/makefile
                 doc/doxyfile doc/makefile)
 
 # copy M4 to shell
diff --git a/doc/makefile.am b/doc/makefile.am
index fd8e4f5..d3a5ae3 100644
--- a/doc/makefile.am
+++ b/doc/makefile.am
@@ -8,7 +8,7 @@
 #develdir = ${pkgdatadir}/doc/devel
 #devel_DATA = devel/index.html
 
-ALL_SRC = ${top_srcdir}/src/*.[ch]xx ${top_srcdir}/src/*.doc
+ALL_SRC = ${top_srcdir}/src/*.[ch]xx ${top_srcdir}/test/*.[ch]xx
 
 DIRS = html latex
 
diff --git a/src/makefile.am b/src/makefile.am
index c32a822..107ea10 100644
--- a/src/makefile.am
+++ b/src/makefile.am
@@ -5,12 +5,14 @@
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
+lib_LTLIBRARIES = libxml-cxx.la
+include_HEADERS = xml.hxx
+
+libxml_cxx_la_SOURCES = xml.cxx
+
 if BUILD_WIN
 else
 endif
 
-clean-local:
-	-rm -r ${QMAKE_TARGET}.app
-
 CLEANFILES = 
 MAINTAINERCLEANFILES = makefile.in
diff --git a/test/makefile.am b/test/makefile.am
new file mode 100644
index 0000000..0f40071
--- /dev/null
+++ b/test/makefile.am
@@ -0,0 +1,16 @@
+## @id $Id$
+
+##       1         2         3         4         5         6         7         8
+## 45678901234567890123456789012345678901234567890123456789012345678901234567890
+
+AM_CXXFLAGS += -I ${top_srcdir}/src
+AM_LDFLAGS = -L${top_builddir}/src
+LDADD = -lcppunit -lxml-cxx
+
+check_PROGRAMS=xml_test
+TESTS=${check_PROGRAMS}
+
+xml_test_SOURCES = xml_test.cxx
+
+CLEANFILES = 
+MAINTAINERCLEANFILES = makefile.in