diff --git a/Makefile.am b/Makefile.am
index ded1004a0eeab5cfc4694c5a85e1684289739d04..1da8c5684e1a401346caa05c570460d1b2e48f95 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
-SUBDIRS = include libs src ringtones m4 
-EXTRA_DIST = tools/*.sh tools/install-sip* debian/* README.cvs CHANGES
+SUBDIRS = include libs src ringtones skins
+EXTRA_DIST = tools/*.sh tools/install-sip* debian/* README.cvs CHANGES 
 
 ACLOCAL_FLAGS=-I$(top_srcdir)/m4
 
diff --git a/Makefile.cvs b/Makefile.cvs
index 63a395bbac52e5a69bbee376450bf7c398e1b6b8..1d5456483573bd1c011d2ddf409eece8a816cb1e 100644
--- a/Makefile.cvs
+++ b/Makefile.cvs
@@ -1,9 +1,12 @@
-all: autotools 
-
-autotools: 
-	./autogen.sh
-
-qt: 
-	cd src/gui/qt && qmake
+all:
+	@echo "This Makefile is only for the CVS repository"
+	@echo "This will be deleted before making the distribution"
+	@echo ""
+	@if test ! -d admin; then \
+                echo "Please recheckout this module!" ;\
+                echo "for cvs: use checkout once and after that update again" ;\
+                exit 1 ;\
+	 fi
+	$(MAKE) -f admin/Makefile.common cvs
 
 
diff --git a/admin/cvs.sh b/admin/cvs.sh
index 3e3726cffa6531f1e6d260dc82adfc17438abcc5..148fd8c44174a22618fd82860514891790f7019b 100644
--- a/admin/cvs.sh
+++ b/admin/cvs.sh
@@ -487,7 +487,7 @@ fi
 acinclude_m4()
 {
   echo "*** Creating acinclude.m4"
-  adds=
+  adds=m4/*
   if grep '\$(top_srcdir)/acinclude.m4:' $makefile_am >/dev/null; then 
     strip_makefile
     rm -f acinclude.m4
diff --git a/configure.ac b/configure.ac
index 80a361aad82e14ad163ee23f29357319b5b9ea34..d0d0717df53d7ea540030141f586ec62ad0bb1b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,6 @@ AC_PATH_QT
 AC_CHECK_COMPILERS
 AC_SUBST(LIBQT)
 
-LIBS="$LIBS -lstdc++ $LIB_QT"
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
@@ -160,8 +159,13 @@ CPPFLAGS=$save_dnssdtest_CPPFLAGS
 LDFLAGS=$save_dnssdtest_LDFLAGS
 LIBS=$save_dnssdtest_LIBS
 fi
+
+sflphone_datadir=$datadir/sflphone
+AC_SUBST(sflphone_datadir)
+
 AC_SUBST(LIB_DNSSD)
 AM_CONDITIONAL(USE_ZEROCONF, test "$have_libdns_sd" = "yes")	
+LIBS="$LIBS -lstdc++ $LIB_QT"
 
 dnl AC_CONFIG_FILES(
 AC_OUTPUT(
diff --git a/libs/Makefile.am b/libs/Makefile.am
index 3a9551dc4795ab32b5c53915cd29f88fd858c418..ed6d4692ca988e41e796f35ce09cc7fa5b089346 100644
--- a/libs/Makefile.am
+++ b/libs/Makefile.am
@@ -1 +1 @@
-SUBDIRS = eXosip2 portaudio stund utilspp
\ No newline at end of file
+SUBDIRS = eXosip2 portaudio stund taxidermy utilspp
\ No newline at end of file
diff --git a/libs/taxidermy/WidgetBuilderCreator.inl b/libs/taxidermy/WidgetBuilderCreator.inl
new file mode 100644
index 0000000000000000000000000000000000000000..a78c1cabb9d9f04d0aed4aef3a198b78ef1d311f
--- /dev/null
+++ b/libs/taxidermy/WidgetBuilderCreator.inl
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Jean-Philippe Barrette-LaPierre
+ *            (jean-philippe.barrette-lapierre@savoirfairelinux.com)
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2,
+ * or (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with dpkg; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+template< typename T >
+taxidermy::WidgetBuilder *
+taxidermy::WidgetBuilderCreator< T >::create()
+{
+  return new T();
+}
+
diff --git a/libs/taxidermy/WidgetBuilderFactoryImpl.inl b/libs/taxidermy/WidgetBuilderFactoryImpl.inl
new file mode 100644
index 0000000000000000000000000000000000000000..9b15b9876c5bea4326a9fa14d474cb408f975b59
--- /dev/null
+++ b/libs/taxidermy/WidgetBuilderFactoryImpl.inl
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Jean-Philippe Barrette-LaPierre
+ *            (jean-philippe.barrette-lapierre@savoirfairelinux.com)
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2,
+ * or (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with dpkg; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+template< typename T >
+void
+taxidermy::WidgetBuilderFactoryImpl::add(const QString &objectType) 
+{
+  mBuilders.insert(objectType, new WidgetBuilderCreator<T>());
+}
+
+