diff --git a/.cvsignore b/.cvsignore
index d48f8c45..2ed581d0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -16,3 +16,4 @@ install-sh
 ltmain.sh
 missing
 mkinstalldirs
+lasso.pc
diff --git a/Makefile.am b/Makefile.am
index 0b897a07..fc79bc57 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,3 +3,6 @@ SUBDIRS		= lasso docs
 ABS_BUILDDIR	= $(shell pwd)
 
 EXTRA_DIST = TODO COPYING
+
+pkgconfig_DATA  = lasso.pc
+pkgconfigdir    = $(libdir)/pkgconfig
diff --git a/configure.ac b/configure.ac
index d7164231..6c54344a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,7 +76,7 @@ case "${host}" in
 esac
 
 dnl ==========================================================================
-dnl Check for __FUNCTION__ or __FUNCTION__
+dnl Check for __FUNCTION__ or __func__
 dnl ==========================================================================
 AC_MSG_CHECKING(for __FUNCTION__ or __func__)
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
@@ -211,13 +211,6 @@ if test "z$LIBXML_FOUND" = "zno" ; then
     fi
 fi
 
-if test "z$LIBXML_FOUND" = "zyes" ; then
-    if test "z$LIBXML262_FOUND" = "zyes" ; then
-	LASSO_DEFINES="-DLASSO_LIBXML_260=1 $LASSO_DEFINES"
-    elif test "z$ac_cv_func_snprintf" != "zyes" -o "z$ac_cv_func_vsnprintf" != "zyes" ; then
-	AC_MSG_ERROR(Functions snprintf and/or vsnprintf are not available on your platform. You need at least libxml2 2.6.2 for this version of $PACKAGE)
-    fi
-fi
 AC_SUBST(LIBXML_CFLAGS)
 AC_SUBST(LIBXML_LIBS)
 AC_SUBST(LIBXML_CONFIG)
@@ -447,6 +440,7 @@ dnl ==========================================================================
 dnl Writing result files
 dnl ==========================================================================
 AC_OUTPUT([
+lasso.pc:lasso.pc.in
 lasso/version.h
 Makefile
 lasso/Makefile
diff --git a/lasso.pc.in b/lasso.pc.in
new file mode 100644
index 00000000..16f2409e
--- /dev/null
+++ b/lasso.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: lasso
+Version: @VERSION@
+Description: A free implementation of the Liberty Alliance specifications
+Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ libxslt >= @LIBXSLT_MIN_VERSION@ xmlsec1 >= @XMLSEC1_MIN_VERSION@ 
+Cflags: @LASSO_CORE_CFLAGS@
+Libs: -L${libdir} @LASSO_CORE_LIBS@