diff --git a/.gitignore b/.gitignore
index c99c757..4a350b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+*~
+c_src/*.o
+priv/*
 */Emakefile
 *Makefile
 *Makefile.in
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 6454e58..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-ACLOCAL_FLAGS = -I m4
-ACLOCAL_AMFLAGS = -I m4
-
-SUBDIRS = c_src include src
-
-if ENABLE_EXAMPLES
-SUBDIRS += examples
-endif
-
-SUBDIRS += ebin
-
-if ENABLE_DOCUMENTATION
-SUBDIRS += doc
-endif
-
-if ENABLE_TESTSUITE
-SUBDIRS += testsuite
-endif
-
-EXTRA_DIST =
-distdir = $(PACKAGE)-$(VERSION)
-
-if ENABLE_TESTSUITE
-check-junit: all
-	cd testsuite && $(MAKE) $(AM_MAKEFLAGS) $@ || exit 1
-else
-check-junit:
-endif
-
-updateknown:
-	cd c_src && $(MAKE) $(AM_MAKEFLAGS) $@ || exit 1
-
-.PHONY: check-junit updateknown
diff --git a/Makefile.unix b/Makefile.unix
deleted file mode 100644
index cc7a052..0000000
--- a/Makefile.unix
+++ /dev/null
@@ -1,8 +0,0 @@
-SUBDIRS = c_src src ebin
-
-all clean:
-	@target=$@ \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-		echo "Making $$target in $$subdir"; \
-		$(MAKE) -C $$subdir -f Makefile.unix $$target; \
-	done;
diff --git a/Makefile.win32 b/Makefile.win32
deleted file mode 100644
index f2975ac..0000000
--- a/Makefile.win32
+++ /dev/null
@@ -1,22 +0,0 @@
-SUBDIRS = c_src.dir							\
-	  include.dir							\
-	  src.dir							\
-	  ebin.dir
-CLEAN = $(SUBDIRS:.dir=.clean)
-MAKEFILE = Makefile.win32
-
-all: $(SUBDIRS)
-
-clean: $(CLEAN)
-
-$(SUBDIRS):
-	@echo Making all in $*
-	@cd $*
-	@$(MAKE) /nologo /f $(MAKEFILE) /$(MAKEFLAGS)
-	@cd ..
-
-$(CLEAN):
-	@echo Making clean in $*
-	@cd $*
-	@$(MAKE) /nologo /f $(MAKEFILE) /$(MAKEFLAGS) clean
-	@cd ..
diff --git a/c_src/Makefile.am b/c_src/Makefile.am
deleted file mode 100644
index 35ea6e4..0000000
--- a/c_src/Makefile.am
+++ /dev/null
@@ -1,107 +0,0 @@
-execdrivers_LTLIBRARIES = exmpp_stringprep.la
-
-if WITH_EXPAT
-execdrivers_LTLIBRARIES += exmpp_xml_expat.la exmpp_xml_expat_legacy.la
-endif
-
-if WITH_LIBXML2
-execdrivers_LTLIBRARIES += exmpp_xml_libxml2.la
-endif
-
-if WITH_OPENSSL
-execdrivers_LTLIBRARIES += exmpp_tls_openssl.la
-endif
-
-if WITH_ZLIB
-execdrivers_LTLIBRARIES += exmpp_compress_zlib.la
-endif
-
-EXTRA_DIST = stringprep_uni_data.h stringprep_uni_norm.h
-
-EI_CPPFLAGS = -I$(ERLANG_ERTS_DIR)/include				\
-	      -I$(ERLANG_LIB_DIR_erl_interface)/include
-EI_LDFLAGS = -L$(ERLANG_LIB_DIR_erl_interface)/lib
-EI_LIBS = -lei_st
-
-execdriversdir = $(ERLANG_INSTALL_LIB_DIR_exmpp)/priv/lib
-
-# --------------------------------------------------------------------
-# Supported port drivers.
-# --------------------------------------------------------------------
-
-# Expat port drivers.
-exmpp_xml_expat_la_CPPFLAGS = $(SMP_CPPFLAGS)				\
-			      $(EI_CPPFLAGS)				\
-			      $(EXPAT_CPPFLAGS)
-exmpp_xml_expat_la_LDFLAGS = -module -avoid-version			\
-			     $(ERL_DRIVER_LDFLAGS)			\
-			     $(EI_LDFLAGS) $(EI_LIBS)			\
-			     $(EXPAT_LDFLAGS) $(EXPAT_LIBS)
-exmpp_xml_expat_la_SOURCES = exmpp_driver.h				\
-			     exmpp_driver.c				\
-			     exmpp_xml.h				\
-			     exmpp_xml.c				\
-			     exmpp_xml_expat.c
-
-exmpp_xml_expat_legacy_la_CPPFLAGS = $(SMP_CPPFLAGS)			\
-				     $(EI_CPPFLAGS)			\
-				     $(EXPAT_CPPFLAGS)
-exmpp_xml_expat_legacy_la_LDFLAGS = -module -avoid-version		\
-				    $(ERL_DRIVER_LDFLAGS)		\
-				    $(EI_LDFLAGS) $(EI_LIBS)		\
-				    $(EXPAT_LDFLAGS) $(EXPAT_LIBS)
-exmpp_xml_expat_legacy_la_SOURCES = exmpp_driver.h			\
-				    exmpp_driver.c			\
-				    exmpp_xml.h				\
-				    exmpp_xml.c				\
-				    exmpp_xml_expat_legacy.c
-
-# LibXML2 port drivers.
-exmpp_xml_libxml2_la_CPPFLAGS = $(SMP_CPPFLAGS)				\
-				$(EI_CPPFLAGS)
-exmpp_xml_libxml2_la_CFLAGS = $(LIBXML2_CFLAGS)
-exmpp_xml_libxml2_la_LDFLAGS = -module -avoid-version			\
-			       $(ERL_DRIVER_LDFLAGS)			\
-			       $(EI_LDFLAGS) $(EI_LIBS)			\
-			       $(LIBXML2_LIBS)
-exmpp_xml_libxml2_la_SOURCES = exmpp_driver.h				\
-			       exmpp_driver.c				\
-			       exmpp_xml.h				\
-			       exmpp_xml.c				\
-			       exmpp_xml_libxml2.c
-
-# Stringprep port driver.
-exmpp_stringprep_la_CPPFLAGS = $(EI_CPPFLAGS)
-exmpp_stringprep_la_LDFLAGS = -module -avoid-version			\
-			      $(ERL_DRIVER_LDFLAGS)			\
-			      $(EI_LDFLAGS) $(EI_LIBS)
-exmpp_stringprep_la_SOURCES = exmpp_driver.h				\
-			      exmpp_driver.c				\
-			      stringprep_uni_data.h			\
-			      stringprep_uni_norm.h			\
-			      exmpp_stringprep.c
-
-# OpenSSL TLS port driver.
-exmpp_tls_openssl_la_CPPFLAGS = $(EI_CPPFLAGS)				\
-				$(OPENSSL_CPPFLAGS)
-exmpp_tls_openssl_la_LDFLAGS = -module -avoid-version			\
-			       $(ERL_DRIVER_LDFLAGS)			\
-			       $(EI_LDFLAGS) $(EI_LIBS)			\
-			       $(OPENSSL_LDFLAGS) $(OPENSSL_LIBS)
-exmpp_tls_openssl_la_SOURCES = exmpp_driver.h				\
-			       exmpp_driver.c				\
-			       exmpp_tls.h				\
-			       exmpp_tls.c				\
-			       exmpp_tls_openssl.c
-
-# Zlib compression port driver.
-exmpp_compress_zlib_la_CPPFLAGS = $(EI_CPPFLAGS)			\
-				  $(ZLIB_CPPFLAGS)
-exmpp_compress_zlib_la_LDFLAGS = -module -avoid-version			\
-				 $(ERL_DRIVER_LDFLAGS)			\
-				 $(EI_LDFLAGS) $(EI_LIBS)		\
-				 $(ZLIB_LDFLAGS) $(ZLIB_LIBS)
-exmpp_compress_zlib_la_SOURCES = exmpp_driver.h				\
-				 exmpp_driver.c				\
-				 exmpp_compress.h			\
-				 exmpp_compress_zlib.c
diff --git a/c_src/Makefile.unix b/c_src/Makefile.unix
deleted file mode 100644
index 4b046a9..0000000
--- a/c_src/Makefile.unix
+++ /dev/null
@@ -1,99 +0,0 @@
-# Programs
-AWK  ?= awk
-CUT  ?= cut
-ERL  ?= erl
-GREP ?= grep
-RM   ?= rm -f
-
-# Erlang paths.
-ERLANG_ROOT_DIR ?= $(shell $(ERL) -noshell -eval 'io:format(code:root_dir())' -run erlang halt)
-ERLANG_LIB_DIR_erl_interface ?= $(shell $(ERL) -noshell -eval 'io:format(code:lib_dir(erl_interface))' -run erlang halt)
-
-# Compile/link flags.
-EI_CPPFLAGS ?= -I$(ERLANG_ROOT_DIR)/usr/include \
-	      -I$(ERLANG_LIB_DIR_erl_interface)/include
-EI_LDFLAGS ?= -L$(ERLANG_LIB_DIR_erl_interface)/lib
-EI_LIBS ?= -lei_st
-
-EXPAT_CPPFLAGS ?= -I/usr/include
-EXPAT_LDFLAGS ?= -L/usr/lib
-EXPAT_LIBS ?= -lexpat
-
-ZLIB_CPPFLAGS ?= -I/usr/include
-ZLIB_LDFLAGS ?= -L/usr/lib
-ZLIB_LIBS ?= -lz
-
-OPENSSL_CPPFLAGS ?= -I/usr/include
-OPENSSL_LDFLAGS ?= -L/usr/lib
-OPENSSL_LIBS ?= -lssl -lcrypto
-
-ifeq ($(shell uname), Darwin)
-DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress
-else
-DYNAMIC_LIB_CFLAGS = -Wall -fpic -shared
-endif
-
-DRIVERS = exmpp_xml_expat.so						\
-	  exmpp_stringprep.so						\
-	  exmpp_tls_openssl.so						\
-	  exmpp_compress_zlib.so
-
-all: $(DRIVERS)
-
-clean:
-	$(RM) $(DRIVERS)
-	$(RM) $(BUILT_SOURCES)
-
-.PHONY: clean
-
-# --------------------------------------------------------------------
-# Supported port drivers.
-# --------------------------------------------------------------------
-
-# Generated headers.
-BUILT_SOURCES = xmpp_nss.h xmpp_names.h xmpp_attrs.h
-
-xmpp_nss.h: xmpp_nss.h.awk xmpp_nss.h.in
-	$(AWK) -f xmpp_nss.h.awk xmpp_nss.h.in > $@
-
-xmpp_names.h: xmpp_names.h.awk xmpp_names.h.in
-	$(AWK) -f xmpp_names.h.awk xmpp_names.h.in > $@
-
-xmpp_attrs.h: xmpp_attrs.h.awk xmpp_attrs.h.in
-	$(AWK) -f xmpp_attrs.h.awk xmpp_attrs.h.in > $@
-
-# Expat port driver
-exmpp_xml_expat_la_CPPFLAGS = -Icontrib					\
-			      $(EI_CPPFLAGS)				\
-			      $(EXPAT_CPPFLAGS)
-exmpp_xml_expat_la_LDFLAGS = $(EI_LDFLAGS) $(EI_LIBS)			\
-			     $(EXPAT_LDFLAGS) $(EXPAT_LIBS)
-exmpp_xml_expat_la_SOURCES = contrib/hashtable.c			\
-			     exmpp_xml_expat.c
-
-exmpp_xml_expat.so: $(BUILT_SOURCES) $(exmpp_xml_expat_la_SOURCES)
-	$(CC) $(exmpp_xml_expat_la_CPPFLAGS) $(CPPFLAGS) $(DYNAMIC_LIB_CFLAGS) $(CFLAGS) $(exmpp_xml_expat_la_LDFLAGS) $(LDFLAGS) $(exmpp_xml_expat_la_SOURCES) -o $@
-
-# Stringprep port driver.
-exmpp_stringprep_la_CPPFLAGS = $(EI_CPPFLAGS)
-exmpp_stringprep_la_LDFLAGS = $(EI_LDFLAGS) $(EI_LIBS)
-exmpp_stringprep_la_SOURCES = exmpp_stringprep.c
-
-exmpp_stringprep.so: $(exmpp_stringprep_la_SOURCES)
-	$(CC) $(exmpp_stringprep_la_CPPFLAGS) $(CPPFLAGS) $(DYNAMIC_LIB_CFLAGS) $(CFLAGS) $(exmpp_stringprep_la_LDFLAGS) $(LDFLAGS) $(exmpp_stringprep_la_SOURCES) -o $@
-
-# OpenSSL TLS port driver.
-exmpp_tls_openssl_la_CPPFLAGS = $(EI_CPPFLAGS)
-exmpp_tls_openssl_la_LDFLAGS = $(EI_LDFLAGS) $(EI_LIBS)
-exmpp_tls_openssl_la_SOURCES = exmpp_tls.c exmpp_tls_openssl.c
-
-exmpp_tls_openssl.so: $(exmpp_tls_openssl_la_SOURCES)
-	$(CC) $(exmpp_tls_openssl_la_CPPFLAGS) $(CPPFLAGS) $(DYNAMIC_LIB_CFLAGS) $(CFLAGS) $(exmpp_tls_openssl_la_LDFLAGS) $(LDFLAGS) $(exmpp_tls_openssl_la_SOURCES) -o $@
-
-# OpenSSL TLS port driver.
-exmpp_compress_zlib_la_CPPFLAGS = $(EI_CPPFLAGS)
-exmpp_compress_zlib_la_LDFLAGS = $(EI_LDFLAGS) $(EI_LIBS)
-exmpp_compress_zlib_la_SOURCES = exmpp_compress_zlib.c
-
-exmpp_compress_zlib.so: $(exmpp_compress_zlib_la_SOURCES)
-	$(CC) $(exmpp_compress_zlib_la_CPPFLAGS) $(CPPFLAGS) $(DYNAMIC_LIB_CFLAGS) $(CFLAGS) $(exmpp_compress_zlib_la_LDFLAGS) $(LDFLAGS) $(exmpp_compress_zlib_la_SOURCES) -o $@
diff --git a/c_src/Makefile.win32 b/c_src/Makefile.win32
deleted file mode 100644
index 7fc1cb1..0000000
--- a/c_src/Makefile.win32
+++ /dev/null
@@ -1,124 +0,0 @@
-# Always define NODEBUG because OpenSSL is built with -MD (not -MDd). This
-# avoids a warning about conflicting MSVCRTs.
-!IFNDEF NODEBUG
-NODEBUG = 1
-!ENDIF
-
-!include <Win32.Mak>
-
-# Erlang environments.
-!IFNDEF ERLANG_ROOT_DIR
-ERLANG_ROOT_DIR = C:\Program Files\erl5.6.2
-!ENDIF
-!IFNDEF ERLANG_LIB_DIR_erl_interface
-ERLANG_LIB_DIR_erl_interface = $(ERLANG_ROOT_DIR)\lib\erl_interface-3.5.6
-!ENDIF
-
-EI_CPPFLAGS = -D__WIN32__ -I"$(ERLANG_ROOT_DIR)\usr\include" -I"$(ERLANG_LIB_DIR_erl_interface)\include"
-EI_LIBS = "$(ERLANG_LIB_DIR_erl_interface)\lib\ei_md.lib"
-
-!IFNDEF EXPAT_PREFIX
-EXPAT_PREFIX = C:\Program Files\Expat 2.0.1
-!ENDIF
-EXPAT_CPPFLAGS = -I"$(EXPAT_PREFIX)\Source\lib"
-EXPAT_LIBS = "$(EXPAT_PREFIX)\Bin\libexpat.lib"
-
-!IFNDEF LIBXML2_PREFIX
-LIBXML2_PREFIX = C:\Program Files\libxml2-2.7.2.win32
-!ENDIF
-LIBXML2_CPPFLAGS = -I"$(LIBXML2_PREFIX)\include"
-LIBXML2_LIBS = "$(LIBXML2_PREFIX)\lib\libxml2.lib"
-
-!IFNDEF OPENSSL_PREFIX
-OPENSSL_PREFIX = C:\Program Files\GnuWin32
-!ENDIF
-OPENSSL_CPPFLAGS = -I"$(OPENSSL_PREFIX)\include"
-OPENSSL_LIBS = "$(OPENSSL_PREFIX)\lib\libssl.lib" "$(OPENSSL_PREFIX)\lib\libcrypto.lib"
-
-!IFNDEF ICONV_PREFIX
-ICONV_PREFIX = C:\Program Files\iconv-1.9.2.win32
-!ENDIF
-ICONV_CPPFLAGS = -I"$(ICONV_PREFIX)\include"
-ICONV_LIBS = "$(ICONV_PREFIX)\lib\iconv.lib"
-
-!IFNDEF ZLIB_PREFIX
-ZLIB_PREFIX = C:\Program Files\zlib123-dll
-!ENDIF
-ZLIB_CPPFLAGS = -I"$(ZLIB_PREFIX)\include"
-ZLIB_LIBS = "$(ZLIB_PREFIX)\lib\zdll.lib"
-
-DRIVERS = exmpp_stringprep.dll
-!IFNDEF DISABLE_XML_EXPAT
-DRIVERS = $(DRIVERS) exmpp_xml_expat.dll exmpp_xml_expat_legacy.dll
-!ENDIF
-!IFNDEF DISABLE_XML_LIBXML2
-DRIVERS = $(DRIVERS) exmpp_xml_libxml2.dll
-!ENDIF
-!IFNDEF DISABLE_TLS_OPENSSL
-DRIVERS = $(DRIVERS) exmpp_tls_openssl.dll
-!ENDIF
-!IFNDEF DISABLE_COMPRESS_ZLIB
-DRIVERS = $(DRIVERS) exmpp_compress_zlib.dll
-!ENDIF
-
-all: $(DRIVERS)
-
-clean:
-	-del $(DRIVERS)
-	-del *.obj *.exp *.lib *.dll.manifest
-
-.PHONY: clean
-
-# --------------------------------------------------------------------
-# Supported port drivers.
-# --------------------------------------------------------------------
-
-# Common sources.
-exmpp_driver.obj: exmpp_driver.h exmpp_driver.c
-	$(cc) $(cdebug) $(cflags) $(cvarsdll) $(EI_CPPFLAGS) $*.c
-exmpp_xml.obj: exmpp_driver.h exmpp_xml.h exmpp_xml.c
-	$(cc) $(cdebug) $(cflags) $(cvarsdll) $(EI_CPPFLAGS) $*.c
-
-# Expat port drivers.
-exmpp_xml_expat.obj: exmpp_driver.h exmpp_xml.h exmpp_xml_expat.c
-	$(cc) $(cdebug) $(cflags) $(cvarsdll) $(EI_CPPFLAGS) $(EXPAT_CPPFLAGS) $*.c
-
-exmpp_xml_expat.dll: exmpp_driver.obj exmpp_xml.obj exmpp_xml_expat.obj
-	$(link) $(ldebug) $(dlllflags) $(conlibsdll) -out:$*.dll $** $(EI_LIBS) $(EXPAT_LIBS)
-
-exmpp_xml_expat_legacy.obj: exmpp_driver.h exmpp_xml.h exmpp_xml_expat_legacy.c
-	$(cc) $(cdebug) $(cflags) $(cvarsdll) $(EI_CPPFLAGS) $(EXPAT_CPPFLAGS) $*.c
-
-exmpp_xml_expat_legacy.dll: exmpp_driver.obj exmpp_xml.obj exmpp_xml_expat_legacy.obj
-	$(link) $(ldebug) $(dlllflags) $(conlibsdll) -out:$*.dll $** $(EI_LIBS) $(EXPAT_LIBS)
-
-# LibXML2 port driver.
-exmpp_xml_libxml2.obj: exmpp_driver.h exmpp_xml.h exmpp_xml_libxml2.c
-	$(cc) $(cdebug) $(cflags) $(cvarsdll) $(EI_CPPFLAGS) $(ICONV_CPPFLAGS) $(LIBXML2_CPPFLAGS) $*.c
-
-exmpp_xml_libxml2.dll: exmpp_driver.obj exmpp_xml.obj exmpp_xml_libxml2.obj
-	$(link) $(ldebug) $(dlllflags) $(conlibsdll) -out:$*.dll $** $(EI_LIBS) $(ICONV_LIBS) $(LIBXML2_LIBS)
-
-# Stringprep port driver.
-exmpp_stringprep.obj: exmpp_driver.h stringprep_uni_data.h stringprep_uni_norm.h exmpp_stringprep.c
-	$(cc) $(cdebug) $(cflags) $(cvarsdll) $(EI_CPPFLAGS) $*.c
-
-exmpp_stringprep.dll: exmpp_driver.obj exmpp_stringprep.obj
-	$(link) $(ldebug) $(dlllflags) $(conlibsdll) -out:$*.dll $** $(EI_LIBS)
-
-# OpenSSL TLS port driver.
-exmpp_tls.obj: exmpp_driver.h exmpp_tls.h exmpp_tls.c
-	$(cc) $(cdebug) $(cflags) $(cvarsdll) $(EI_CPPFLAGS) $*.c
-
-exmpp_tls_openssl.obj: exmpp_driver.h exmpp_tls.h exmpp_tls_openssl.c
-	$(cc) $(cdebug) $(cflags) $(cvarsdll) $(EI_CPPFLAGS) $(OPENSSL_CPPFLAGS) $*.c
-
-exmpp_tls_openssl.dll: exmpp_driver.obj exmpp_tls.obj exmpp_tls_openssl.obj
-	$(link) $(ldebug) $(dlllflags) $(conlibsdll) -out:$*.dll $** $(EI_LIBS) $(OPENSSL_LIBS)
-
-# Zlib compression port driver.
-exmpp_compress_zlib.obj: exmpp_driver.h exmpp_compress.h exmpp_compress_zlib.c
-	$(cc) $(cdebug) $(cflags) $(cvarsdll) $(EI_CPPFLAGS) $(ZLIB_CPPFLAGS) $*.c
-
-exmpp_compress_zlib.dll: exmpp_driver.obj exmpp_compress_zlib.obj
-	$(link) $(ldebug) $(dlllflags) $(conlibsdll) -out:$*.dll $** $(EI_LIBS) $(ZLIB_LIBS)
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index fc6798c..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,443 +0,0 @@
-dnl ------------------------------------------------------------------
-dnl Autoconf initialization.
-dnl ------------------------------------------------------------------
-
-AC_INIT([exmpp], m4_esyscmd([(git describe 2>/dev/null || echo v0.9.9) | sed 's/^v//' |
-        sed 's/-\([0-9]\)-/-0\1-/' | tr -d '\n' || echo 1]),
-        [js.pedron@meetic-corp.com], [exmpp])
-
-AC_CONFIG_SRCDIR([include/exmpp.hrl])
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_AUX_DIR([ac-aux])
-
-AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE([foreign])
-
-AC_PREREQ([2.60])
-AC_REVISION([$Revision$])
-
-dnl ------------------------------------------------------------------
-dnl Internal functions for this configure script.
-dnl ------------------------------------------------------------------
-
-dnl EMKOPTS is used by Emakefile(s).
-append_to_EMKOPTS () {
-	if test -z "[$]EMKOPTS"; then
-		EMKOPTS="[$]1"
-	else
-		EMKOPTS="[$]{EMKOPTS% }, [$]1"
-	fi
-}
-
-dnl Expand shell variables to have a nice output in the final report.
-expand_var () {
-	local v=`eval echo '$'[$]1`
-	while test "`echo [$]v | grep [[$]] > /dev/null && echo nok`"; do
-		v=`eval echo [$]v`
-	done
-	echo [$]v
-}
-
-dnl ------------------------------------------------------------------
-dnl Versioning.
-dnl ------------------------------------------------------------------
-
-dnl Release date.
-dnl EXMPP_RELEASE_DATE=
-
-dnl Is this a final release?
-is_release=0
-GITDESC1=`git describe --abbrev=0 || echo 1`
-GITDESC2=`git describe --abbrev=4 || echo 1`
-if test "${GITDESC1}" = "${GITDESC2}"; then
-       is_release=1
-fi
-
-dnl ------------------------------------------------------------------
-dnl Compilater and other tools.
-dnl ------------------------------------------------------------------
-
-AC_PROG_CC_STDC
-
-AC_PROG_LD
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_PROG_SED
-
-COLORED_ECHO_INIT
-
-dnl ------------------------------------------------------------------
-dnl Libtool.
-dnl ------------------------------------------------------------------
-
-dnl Hack to skip C++/Fortran tests (stolen from Beep Media Player)
-m4_undefine([AC_PROG_CXX])
-m4_defun([AC_PROG_CXX],[])
-m4_undefine([AC_PROG_F77])
-m4_defun([AC_PROG_F77],[])
-
-AM_DISABLE_STATIC
-AM_ENABLE_SHARED
-
-AM_PROG_LIBTOOL
-
-dnl ------------------------------------------------------------------
-dnl Options.
-dnl ------------------------------------------------------------------
-
-dnl Debugging option.
-if test $is_release -eq 0; then
-	default_enable_debug="yes"
-else
-	default_enable_debug="no"
-fi
-AC_ARG_ENABLE([debug],
-	AC_HELP_STRING([--enable-debug],
-	    [turn on debugging [[default=auto]]]),,
-	enable_debug=$default_enable_debug)
-if test "x${enable_debug}" = "xyes"; then
-	dnl AC_DEFINE([DEBUG], [], [Enable debug])
-	append_to_EMKOPTS "debug_info"
-	append_to_EMKOPTS "{d, debug}"
-else
-	CPPFLAGS="-DNDEBUG ${CPPFLAGS# }"
-fi
-
-dnl Print any warnings.
-if test "x$GCC" = "xyes"; then
-	CFLAGS="${CFLAGS% } -Wall"
-fi
-append_to_EMKOPTS "report_warnings"
-append_to_EMKOPTS "{warn_format, 1}"
-append_to_EMKOPTS "warn_export_vars"
-append_to_EMKOPTS "warn_shadow_vars"
-append_to_EMKOPTS "warn_unused_import"
-
-dnl Treat warnings as errors.
-AC_ARG_ENABLE([warnings],
-	AC_HELP_STRING([--enable-warnings],
-	    [treat warnings as errors [[default=yes]]]),,
-	enable_warnings="yes")
-if test "x${enable_warnings}" = "xyes" -a "x${GCC}" = "xyes"; then
-	CFLAGS="${CFLAGS% } -Werror"
-fi
-
-dnl Compatibility modules.
-AC_ARG_ENABLE([compat],
-	AC_HELP_STRING([--enable-compat],
-	    [build compatibility modules [[default=no]]]),,
-	enable_compat="no")
-if test "x${enable_compat}" = "xyes"; then
-	COMPAT_MODULES_START=","
-	COMPAT_MODULES=""
-else
-	COMPAT_MODULES_START=" % Compatibility modules disabled:"
-	COMPAT_MODULES="%"
-fi
-AM_CONDITIONAL(BUILD_COMPAT, test "x${enable_compat}" = "xyes")
-AC_SUBST(COMPAT_MODULES_START)
-AC_SUBST(COMPAT_MODULES)
-
-dnl Documentation.
-AC_ARG_ENABLE([documentation],
-	AC_HELP_STRING([--enable-documentation],
-	    [build documentation [[default=yes]]]),,
-	enable_documentation="yes")
-AM_CONDITIONAL(ENABLE_DOCUMENTATION, test "x${enable_documentation}" = "xyes")
-
-dnl Examples.
-AC_ARG_ENABLE([examples],
-	AC_HELP_STRING([--enable-examples],
-	    [build examples [[default=no]]]),,
-	enable_examples="no")
-AM_CONDITIONAL(ENABLE_EXAMPLES, test "x${enable_examples}" = "xyes")
-
-dnl Internal escaping function to use.
-AC_ARG_ENABLE([escaping-using-cdata],
-	AC_HELP_STRING([--enable-escaping-using-cdata],
-	    [escape XML text node with CDATA sections [[default=off]]]),,
-	enable_escaping_using_cdata="no")
-if test "x${enable_escaping_using_cdata}" = "xyes"; then
-	append_to_EMKOPTS "{d, 'ESCAPE_USING_CDATA_SECTIONS'}"
-fi
-
-dnl ------------------------------------------------------------------
-dnl Erlang environment.
-dnl ------------------------------------------------------------------
-
-echo
-COLORED_ECHO([%BErlang environment%b])
-
-dnl Available flags.
-AC_ARG_WITH([erlang],
-	AC_HELP_STRING([--with-erlang=PREFIX],
-	    [prefix where build machine's Erlang is installed (optional)]),
-	with_erlang=${withval%/},
-	with_erlang="")
-
-dnl erl(1) is used to compile Erlang modules.
-if test "x${with_erlang}" = "x"; then
-	AC_ERLANG_PATH_ERL
-	AC_ERLANG_PATH_ERLC
-else
-	erl_path="${with_erlang}/bin"
-	AC_ERLANG_PATH_ERL(, [$erl_path$PATH_SEPARATOR$PATH])
-	AC_ERLANG_PATH_ERLC(, [$erl_path$PATH_SEPARATOR$PATH])
-fi
-
-if test "x${ERL}" = "x"; then
-	AC_MSG_ERROR([
-Erlang not found. Fill the ERL variable with erl(1) path or provide
-Erlang prefix with --with-erlang.])
-fi
-
-dnl escript(1) is used by the testsuite.
-AC_ARG_VAR([ESCRIPT], [Erlang/OTP interpreter command [autodetected]])
-
-if test "x${ESCRIPT}" = "x"; then
-	if test "x${with_erlang}" = "x"; then
-		AC_PATH_PROG([ESCRIPT], [escript],,)
-	else
-		erl_path="${with_erlang}/bin"
-		AC_PATH_PROG([ESCRIPT], [escript],,
-		    [$erl_path$PATH_SEPARATOR$PATH])
-	fi
-else
-	AC_MSG_CHECKING([for escript])
-	AC_MSG_RESULT([$ESCRIPT])
-fi
-
-if test "x${ESCRIPT}" = "x"; then
-	AC_MSG_WARN([
-escript(1) not found. Fill the ESCRIPT variable with escript(1) path if
-you want to use the testsuite.])
-fi
-
-dnl Get Erlang $ROOT dir and lib dir.
-AC_ERLANG_SUBST_ROOT_DIR
-AC_ERLANG_SUBST_LIB_DIR
-
-dnl Get ERTS version.
-ERLANG_CHECK_ERTS
-ERLANG_CHECK_RELEASE
-
-dnl Erlang R12B-5 (ERTS 5.6.5) is required to build Exmpp.
-AX_COMPARE_VERSION([${ERLANG_ERTS_VER}], [ge], [5.6.5],
-    [is_erlang_r12b="yes"],
-    [is_erlang_r12b="no"])
-if test "x${is_erlang_r12b}" = "xno"; then
-	AC_MSG_ERROR([
-Erlang R12B-5 is required to build Exmpp but only Erlang $ERLANG_RELEASE was found!])
-fi
-
-dnl Check for Erlang applications.
-
-dnl Check for erl_interface (used by port drivers).
-AC_ERLANG_CHECK_LIB([erl_interface],,
-    [AC_MSG_ERROR([erl_interface was not found!])])
-
-dnl Check for EUnit (used for the testsuite).
-if test "x${ESCRIPT}" = "x"; then
-	AC_ERLANG_CHECK_LIB([eunit],,)
-fi
-
-dnl Determine directories for installation.
-if test "x${prefix}" = "xNONE"; then
-	dnl Inside Erlang lib directory.
-	ERLANG_INSTALL_LIB_DIR="${ERLANG_LIB_DIR}"
-else
-	dnl Under $prefix
-	ERLANG_INSTALL_LIB_DIR="${prefix}"
-fi
-
-AC_ERLANG_SUBST_INSTALL_LIB_DIR
-AC_ERLANG_SUBST_INSTALL_LIB_SUBDIR(exmpp, ${VERSION})
-
-dnl SMP support.
-dnl
-dnl Support is enabled by default for Erlang R12B and later ; disabled
-dnl otherwise.
-AC_MSG_CHECKING([for SMP support])
-
-AC_ARG_ENABLE([smp-support],
-	AC_HELP_STRING([--enable-smp-support],
-	    [enable SMP support [[default=yes]]]),,
-	enable_smp_support="yes")
-AM_CONDITIONAL(ENABLE_SMP_SUPPORT, test "x${enable_smp_support}" = "xyes")
-
-if test "x${enable_smp_support}" = "xyes"; then
-	AC_DEFINE(SMP_SUPPORT, [], [SMP support enabled in port drivers.])
-	AC_DEFINE(USE_RWLOCK, [], [Use rwlocks.])
-	AC_DEFINE(_REENTRANT, [], [_REENTRANT])
-
-	AC_MSG_RESULT([yes (Erlang $ERLANG_RELEASE)])
-else
-	AC_MSG_RESULT([no (disabled by user)])
-fi
-
-dnl Do we have all the tools for the testsuite to be used.
-if test "x${ERLANG_LIB_DIR_eunit}" != "xnot found" -a "x${ESCRIPT}" != "x"; then
-	enable_testsuite="yes"
-else
-	enable_testsuite="no"
-fi
-AM_CONDITIONAL([ENABLE_TESTSUITE], [test "x${enable_testsuite}" = "xyes"])
-
-dnl ------------------------------------------------------------------
-dnl Dependencies.
-dnl ------------------------------------------------------------------
-
-echo
-COLORED_ECHO([%BXML parsers dependencies%b])
-
-dnl Expat port driver.
-EXMPP_EXPAT(build_with_expat="yes", build_with_expat="no")
-AM_CONDITIONAL(WITH_EXPAT, test "x${build_with_expat}" = "xyes")
-if test "x${build_with_expat}" = "xyes"; then
-	append_to_EMKOPTS "{d, 'HAVE_EXPAT'}"
-fi
-
-dnl LibXML2 port driver.
-PKG_CHECK_MODULES([LIBXML2], [libxml-2.0],
-    build_with_libxml2="yes", build_with_libxml2="no")
-AM_CONDITIONAL(WITH_LIBXML2, test "x${build_with_libxml2}" = "xyes")
-if test "x${build_with_libxml2}" = "xyes"; then
-	append_to_EMKOPTS "{d, 'HAVE_LIBXML2'}"
-fi
-
-echo
-COLORED_ECHO([%BTLS engines dependencies%b])
-
-dnl OpenSSL TLS port driver.
-EXMPP_OPENSSL(build_with_openssl="yes", build_with_openssl="no")
-AM_CONDITIONAL(WITH_OPENSSL, test "x${build_with_openssl}" = "xyes")
-if test "x${build_with_openssl}" = "xyes"; then
-	append_to_EMKOPTS "{d, 'HAVE_OPENSSL'}"
-fi
-
-echo
-COLORED_ECHO([%BCompression engines dependencies%b])
-
-dnl Zlib compression port driver.
-EXMPP_ZLIB(build_with_zlib="yes", build_with_zlib="no")
-AM_CONDITIONAL(WITH_ZLIB, test "x${build_with_zlib}" = "xyes")
-if test "x${build_with_zlib}" = "xyes"; then
-	append_to_EMKOPTS "{d, 'HAVE_ZLIB'}"
-fi
-
-dnl ------------------------------------------------------------------
-dnl Detect Operating System.
-dnl ------------------------------------------------------------------
-
-echo
-COLORED_ECHO([%BDetect Operating System%b])
-
-AC_CANONICAL_SYSTEM
-#AC_DEFINE_UNQUOTED(CPU_VENDOR_OS, "$target")
-#AC_SUBST(target_os)
-case "$target_os" in
-    *darwin10*)
-	echo "Target OS is: Darwin10 (Mac OS X)"
-	AC_LANG(Erlang)
-	AC_RUN_IFELSE(
-	    [AC_LANG_PROGRAM([],[dnl
-	     halt(case erlang:system_info(wordsize) of
-	     8 -> 0; 4 -> 1 end)])],
-	    [AC_MSG_NOTICE(found 64-bit Erlang)
-	     CBIT=-m64],
-	    [AC_MSG_NOTICE(found 32-bit Erlang)
-	     CBIT=-m32])
-	;;
-    *)        
-	echo "Target OS is: '$target_os'"
-	CBIT=""
-	;;
-esac
-CFLAGS="$CFLAGS $CBIT"
-LD_SHARED="$LD_SHARED $CBIT"
-echo "CBIT = '$CBIT'"
-echo "CFLAGS = '$CFLAGS'"
-echo "LD_SHARED = '$LD_SHARED'"
-
-dnl ------------------------------------------------------------------
-dnl Finale substitutions.
-dnl ------------------------------------------------------------------
-
-CPPFLAGS="${CPPFLAGS# }"
-CFLAGS="${CFLAGS# }"
-LDFLAGS="${LDFLAGS# }"
-
-CPPFLAGS="${CPPFLAGS% }"
-CFLAGS="${CFLAGS% }"
-LDFLAGS="${LDFLAGS% }"
-
-AC_SUBST(EMKOPTS)
-
-AC_SUBST(EXMPP_RELEASE_DATE)
-
-AC_SUBST(EXMPP_BUILD_ARCH)
-AC_SUBST(EXMPP_HOST_ARCH)
-
-exp_ERLANG_INSTALL_LIB_DIR_exmpp=`expand_var ERLANG_INSTALL_LIB_DIR_exmpp`
-AC_SUBST(exp_ERLANG_INSTALL_LIB_DIR_exmpp)
-
-AC_SUBST(ERL_DRIVER_LDFLAGS)
-
-dnl ------------------------------------------------------------------
-dnl Autoconf output.
-dnl ------------------------------------------------------------------
-
-echo
-AM_CONFIG_HEADER([config.h])
-AC_CONFIG_FILES([
-	c_src/Makefile
-	include/Makefile
-	include/internal/Makefile
-	src/Makefile
-	src/Emakefile
-	ebin/Makefile
-	ebin/exmpp.app
-	ebin/exmpp.appup
-	doc/Makefile
-	testsuite/Makefile
-	examples/Makefile
-	examples/Emakefile
-	Makefile
-])
-AC_CONFIG_FILES([
-	testsuite/etest
-], [chmod +x testsuite/etest])
-AC_OUTPUT
-
-dnl --------------------------------------------------
-dnl Configuration report
-dnl --------------------------------------------------
-
-echo
-COLORED_ECHO([ %B== exmpp ${PACKAGE_VERSION} ==%b])
-echo
-COLORED_ECHO([Configuration:])
-COLORED_ECHO([    Prefix:             ${prefix}])
-COLORED_ECHO([    Application dir.:   ${exp_ERLANG_INSTALL_LIB_DIR_exmpp}])
-echo
-COLORED_ECHO([    C compiler:         ${CC} ${CFLAGS}])
-COLORED_ECHO([    Erlang emulator:    ${ERL}])
-COLORED_ECHO([    Erlang compiler:    ${ERLC}])
-COLORED_ECHO([    Erlang interpreter: ${ESCRIPT}])
-echo
-COLORED_ECHO([    Debug/warnings:     ${enable_debug}/${enable_warnings}])
-COLORED_ECHO([    Compat modules:     ${enable_compat}])
-COLORED_ECHO([    Documentation:      ${enable_documentation}])
-COLORED_ECHO([    Testsuite:          ${enable_testsuite}])
-COLORED_ECHO([    Examples:           ${enable_examples}])
-echo
-COLORED_ECHO([    XML parsers:])
-COLORED_ECHO([      . Expat:          ${build_with_expat}])
-COLORED_ECHO([      . LibXML2:        ${build_with_libxml2}])
-echo
-COLORED_ECHO([    TLS engines:])
-COLORED_ECHO([      . OpenSSL:        ${build_with_openssl}])
-echo
-COLORED_ECHO([    Compression engines:])
-COLORED_ECHO([      . Zlib:           ${build_with_zlib}])
-echo
diff --git a/ebin/Makefile.am b/ebin/Makefile.am
deleted file mode 100644
index 122dedd..0000000
--- a/ebin/Makefile.am
+++ /dev/null
@@ -1,69 +0,0 @@
-beamdir = $(ERLANG_INSTALL_LIB_DIR_exmpp)/ebin
-
-BEAM_FILES = exmpp.app							\
-	     exmpp.appup						\
-	     exmpp.beam							\
-	     exmpp_caps.beam					\
-	     exmpp_compress.beam					\
-	     exmpp_dialback.beam					\
-	     exmpp_dns.beam						\
-	     exmpp_internals.beam					\
-	     exmpp_utils.beam						\
-	     exmpp_iq.beam						\
-	     exmpp_jid.beam						\
-	     exmpp_message.beam						\
-	     exmpp_presence.beam					\
-	     exmpp_stanza.beam						\
-	     exmpp_stream.beam						\
-	     exmpp_stringprep.beam					\
-	     exmpp_sup.beam						\
-	     exmpp_tls.beam						\
-	     exmpp_xml.beam						\
-	     exmpp_xmlstream.beam					\
-	     exmpp_known_nss.beam					\
-	     exmpp_known_elems.beam					\
-	     exmpp_known_attrs.beam					\
-	     exmpp_client_binding.beam					\
-	     exmpp_client_compression.beam				\
-	     exmpp_client_disco.beam					\
-	     exmpp_client_legacy_auth.beam				\
-	     exmpp_client_privacy.beam					\
-	     exmpp_client_pubsub.beam					\
-	     exmpp_client_register.beam					\
-	     exmpp_client_roster.beam					\
-	     exmpp_client_sasl.beam					\
-	     exmpp_client_session.beam					\
-	     exmpp_client_tls.beam					\
-	     exmpp_client_muc.beam					\
-	     exmpp_server_binding.beam					\
-	     exmpp_server_compression.beam				\
-	     exmpp_server_legacy_auth.beam				\
-	     exmpp_server_privacy.beam					\
-	     exmpp_server_sasl.beam					\
-	     exmpp_server_session.beam					\
-	     exmpp_server_tls.beam					\
-	     exmpp_sasl_digest.beam					\
-	     exmpp_session.beam						\
-	     exmpp_socket.beam						\
-	     exmpp_bosh.beam						\
-	     exmpp_component.beam
-
-if BUILD_COMPAT
-BEAM_FILES += ejabberd_socket.beam					\
-	      stringprep.beam						\
-	      tls.beam							\
-	      xml.beam							\
-	      xml_stream.beam
-endif
-
-beam_DATA = $(BEAM_FILES)
-
-CLEANFILES = $(beam_DATA)
-
-if ENABLE_EXAMPLES
-examplesdir = $(ERLANG_INSTALL_LIB_DIR_exmpp)/examples/ebin
-
-examples_DATA = echo_client.beam
-
-CLEANFILES += $(examples_DATA)
-endif
diff --git a/ebin/Makefile.unix b/ebin/Makefile.unix
deleted file mode 100644
index 19cd537..0000000
--- a/ebin/Makefile.unix
+++ /dev/null
@@ -1,29 +0,0 @@
-# Programs.
-CUT  ?= cut
-GREP ?= grep
-RM   ?= rm -f
-SED  ?= sed
-
-all: exmpp.app exmpp.appup
-
-exmpp.app: exmpp.app.in
-	@echo Generate: $@; \
-	version=`$(GREP) AC_INIT ../configure.ac | $(CUT) -d' ' -f 2 | $(SED) -e 's|[],[]||g'`; \
-	$(SED) \
-		-e "s|@VERSION@|$$version|g" \
-		-e 's|@COMPAT_MODULES_START@|,|' \
-		-e 's|@COMPAT_MODULES@||g' \
-		$? > $@
-
-exmpp.appup: exmpp.appup.in
-	@echo Generate: $@; \
-	version=`$(GREP) AC_INIT ../configure.ac | $(CUT) -d' ' -f 2 | $(SED) -e 's|[],[]||g'`; \
-	$(SED) \
-		-e "s|@VERSION@|$$version|g" \
-		$? > $@
-
-clean:
-	$(RM) *.beam
-	$(RM) exmpp.app exmpp.appup
-
-.PHONY: clean
diff --git a/ebin/Makefile.win32 b/ebin/Makefile.win32
deleted file mode 100644
index 16075cc..0000000
--- a/ebin/Makefile.win32
+++ /dev/null
@@ -1,13 +0,0 @@
-all: exmpp.app exmpp.appup
-
-clean:
-	-del *.beam
-	-del exmpp.app exmpp.appup
-
-exmpp.app: exmpp.app.in
-	@echo Generate: $@
-	cscript /nologo $@.js ../configure.ac $@.in > $@
-
-exmpp.appup: exmpp.appup.in
-	@echo Generate: $@
-	cscript /nologo exmpp.app.js ../configure.ac $@.in > $@
diff --git a/include/internal/Makefile b/include/internal/Makefile
new file mode 100644
index 0000000..cfde315
--- /dev/null
+++ b/include/internal/Makefile
@@ -0,0 +1,48 @@
+srcdir=.
+
+MAKE_SPECS_LIST = $(srcdir)/make-specs-list
+EXTRACT_KNOWN = $(srcdir)/extract-known-from-specs
+
+KNOWN_NSS_SOURCE = exmpp_known_nss.in
+KNOWN_ELEMS_SOURCE = exmpp_known_elems.in
+KNOWN_ATTRS_SOURCE = exmpp_known_attrs.in
+
+KNOWN_NSS_HRL = exmpp_known_nss.hrl
+KNOWN_ELEMS_HRL = exmpp_known_elems.hrl
+KNOWN_ATTRS_HRL = exmpp_known_attrs.hrl
+
+BUILT_SOURCES = $(KNOWN_NSS_SOURCE) $(KNOWN_ELEMS_SOURCE) $(KNOWN_ATTRS_SOURCE)
+BUILT_HEADERS = $(KNOWN_NSS_HRL) $(KNOWN_ELEMS_HRL) $(KNOWN_ATTRS_HRL)
+
+CLEANFILES = $(BUILT_SOURCES) $(BUILT_HEADERS)
+
+all: $(BUILT_HEADERS)
+
+clean:
+	rm -r $(CLEANFILES)
+
+# --------------------------------------------------------------------
+# Known namespaces/names/attributes headers generation.
+# --------------------------------------------------------------------
+
+exmpp_known_nss.hrl: $(srcdir)/exmpp_known_nss.hrl.es $(KNOWN_NSS_SOURCE)
+	$(srcdir)/exmpp_known_nss.hrl.es $(KNOWN_NSS_SOURCE) > $@
+
+exmpp_known_elems.hrl: $(srcdir)/exmpp_known_elems.hrl.es $(KNOWN_ELEMS_SOURCE)
+	$(srcdir)/exmpp_known_elems.hrl.es $(KNOWN_ELEMS_SOURCE) > $@
+
+exmpp_known_attrs.hrl: $(srcdir)/exmpp_known_attrs.hrl.es $(KNOWN_ATTRS_SOURCE)
+	$(srcdir)/exmpp_known_attrs.hrl.es $(KNOWN_ATTRS_SOURCE) > $@
+
+# --------------------------------------------------------------------
+# Known namespaces/names/attributes updates.
+# --------------------------------------------------------------------
+
+updateknown: $(MAKE_SPECS_LIST) $(EXTRACT_KNOWN)
+	@( $(MAKE_SPECS_LIST); cat occi-schemas.in )   			\
+		| $(EXTRACT_KNOWN)					\
+		$(KNOWN_NSS_SOURCE)					\
+		$(KNOWN_ELEMS_SOURCE)					\
+		$(KNOWN_ATTRS_SOURCE)
+
+.PHONY: all clean updateknown
diff --git a/include/internal/Makefile.am b/include/internal/Makefile.am
deleted file mode 100644
index ae9fae5..0000000
--- a/include/internal/Makefile.am
+++ /dev/null
@@ -1,52 +0,0 @@
-MAKE_SPECS_LIST = $(srcdir)/make-specs-list
-EXTRACT_KNOWN = $(srcdir)/extract-known-from-specs
-
-KNOWN_NSS_SOURCE = $(srcdir)/exmpp_known_nss.in
-KNOWN_ELEMS_SOURCE = $(srcdir)/exmpp_known_elems.in
-KNOWN_ATTRS_SOURCE = $(srcdir)/exmpp_known_attrs.in
-
-EXTRA_DIST = $(MAKE_SPECS_LIST) $(EXTRACT_KNOWN)			\
-	     $(KNOWN_NSS_SOURCE)					\
-	     $(KNOWN_ELEMS_SOURCE)					\
-	     $(KNOWN_ATTRS_SOURCE)					\
-	     exmpp_known_nss.hrl.awk					\
-	     exmpp_known_nss.hrl.js					\
-	     exmpp_known_elems.hrl.awk					\
-	     exmpp_known_elems.hrl.js					\
-	     exmpp_known_attrs.hrl.awk					\
-	     exmpp_known_attrs.hrl.js
-
-BUILT_SOURCES = exmpp_known_nss.hrl					\
-		exmpp_known_elems.hrl					\
-		exmpp_known_attrs.hrl
-
-internalheadersdir = $(ERLANG_INSTALL_LIB_DIR_exmpp)/include/internal
-
-internalheaders_HEADERS = $(BUILT_SOURCES) 
-
-CLEANFILES = $(BUILT_SOURCES)
-
-# --------------------------------------------------------------------
-# Known namespaces/names/attributes headers generation.
-# --------------------------------------------------------------------
-
-exmpp_known_nss.hrl: $(srcdir)/exmpp_known_nss.hrl.awk $(KNOWN_NSS_SOURCE)
-	$(AWK) -f $(srcdir)/exmpp_known_nss.hrl.awk $(KNOWN_NSS_SOURCE) > $@
-
-exmpp_known_elems.hrl: $(srcdir)/exmpp_known_elems.hrl.awk $(KNOWN_ELEMS_SOURCE)
-	$(AWK) -f $(srcdir)/exmpp_known_elems.hrl.awk $(KNOWN_ELEMS_SOURCE) > $@
-
-exmpp_known_attrs.hrl: $(srcdir)/exmpp_known_attrs.hrl.awk $(KNOWN_ATTRS_SOURCE)
-	$(AWK) -f $(srcdir)/exmpp_known_attrs.hrl.awk $(KNOWN_ATTRS_SOURCE) > $@
-
-# --------------------------------------------------------------------
-# Known namespaces/names/attributes updates.
-# --------------------------------------------------------------------
-
-updateknown: $(MAKE_SPECS_LIST) $(EXTRACT_KNOWN)
-	@$(MAKE_SPECS_LIST) | $(EXTRACT_KNOWN)				\
-		$(KNOWN_NSS_SOURCE)					\
-		$(KNOWN_NAMES_SOURCE)					\
-		$(KNOWN_ATTRS_SOURCE)
-
-.PHONY: updateknown
diff --git a/include/internal/exmpp_known_attrs.hrl.es b/include/internal/exmpp_known_attrs.hrl.es
new file mode 100755
index 0000000..4574cd0
--- /dev/null
+++ b/include/internal/exmpp_known_attrs.hrl.es
@@ -0,0 +1,27 @@
+#!/usr/bin/env escript
+%% -*- erlang -*-
+
+main([ Known_ATTRS_Src ]) ->
+    io:format("% Generated by ~p~n", [filename:basename(escript:script_name())]),
+    Attributes = lists:usort(read_attrs(Known_ATTRS_Src)),
+    io:format("-define(XMPP_KNOWN_ATTRS,~n"
+              "        ~p).~n~n",
+              [ [ binary_to_atom(ATTR, utf8)
+                  || ATTR <- Attributes ] ]).
+
+read_attrs(Known_ATTRS_Src) ->
+    {ok, File} = file:open(Known_ATTRS_Src, [read, binary]),
+    read_attrs(File, io:get_line(File, ""), []).
+
+read_attrs(File, eof, Acc) ->
+    file:close(File),
+    lists:reverse(Acc);
+read_attrs(File, << $#, _/binary >>, Acc) ->
+    read_attrs(File, io:get_line(File, ""), Acc);
+read_attrs(File, << $\n >>, Acc) ->
+    read_attrs(File, io:get_line(File, ""), Acc);
+read_attrs(File, ATTR_bin, Acc) when is_binary(ATTR_bin) ->
+    Len = byte_size(ATTR_bin) - 1,
+    << ATTR:Len/binary, _/binary >> = ATTR_bin,
+    read_attrs(File, io:get_line(File, ""),
+	       [ATTR | Acc]).
diff --git a/include/internal/exmpp_known_attrs.in b/include/internal/exmpp_known_attrs.in
index f002267..6dc4603 100644
--- a/include/internal/exmpp_known_attrs.in
+++ b/include/internal/exmpp_known_attrs.in
@@ -1,4 +1,4 @@
-# Generated by extract-known-from-specs r560 on 2008-08-01T09:50:15Z
+# Generated by extract-known-from-specs r0 on 2013-10-08T15:22:55Z
 # vim:ft=conf:
 
 # --------------------------------------------------------------------
@@ -70,21 +70,10 @@ code
 
 # urn:ietf:params:xml:ns:xmpp-e2e
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0003
-# NAME:		Proxy Accept Socket Service (PASS)
-# URL:		http://www.xmpp.org/extensions/xep-0003.html
-# STATUS:	Deprecated
-# TYPE:		Historical
-# DATE:		2007-01-17
-
-# jabber:iq:pass
-port
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0004
 # NAME:		Data Forms
-# URL:		http://www.xmpp.org/extensions/xep-0004.html
+# URL:		http://xmpp.org/extensions/xep-0004.html
 # STATUS:	Final
 # TYPE:		Standards Track
 # DATE:		2007-08-13
@@ -97,101 +86,27 @@ var
 # --------------------------------------------------------------------
 # XEP:		XEP-0009
 # NAME:		Jabber-RPC
-# URL:		http://www.xmpp.org/extensions/xep-0009.html
+# URL:		http://xmpp.org/extensions/xep-0009.html
 # STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2006-02-09
+# DATE:		2011-11-10
 
 # jabber:iq:rpc
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0011
-# NAME:		Jabber Browsing
-# URL:		http://www.xmpp.org/extensions/xep-0011.html
-# STATUS:	Deprecated
-# TYPE:		Historical
-# DATE:		2004-11-12
-
-# jabber:iq:browse
-category
-jid
-name
-type
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0012
 # NAME:		Last Activity
-# URL:		http://www.xmpp.org/extensions/xep-0012.html
-# STATUS:	Draft
+# URL:		http://xmpp.org/extensions/xep-0012.html
+# STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2008-07-16
+# DATE:		2008-11-26
 
 # jabber:iq:last
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0013
-# NAME:		Flexible Offline Message Retrieval
-# URL:		http://www.xmpp.org/extensions/xep-0013.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2005-07-14
-
-# http://jabber.org/protocol/offline
-action
-jid
-node
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0016
-# NAME:		Privacy Lists
-# URL:		http://www.xmpp.org/extensions/xep-0016.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-02-15
-
-# jabber:iq:privacy
-name
-action
-order
-type
-value
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0020
-# NAME:		Feature Negotiation
-# URL:		http://www.xmpp.org/extensions/xep-0020.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2006-11-21
-
-# http://jabber.org/protocol/feature-neg
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0022
-# NAME:		Message Events
-# URL:		http://www.xmpp.org/extensions/xep-0022.html
-# STATUS:	Deprecated
-# TYPE:		Historical
-# DATE:		2007-09-26
-
-# jabber:x:event
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0023
-# NAME:		Message Expiration
-# URL:		http://www.xmpp.org/extensions/xep-0023.html
-# STATUS:	Deprecated
-# TYPE:		Historical
-# DATE:		2004-10-18
-
-# jabber:x:expire
-seconds
-stored
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0027
 # NAME:		Current Jabber OpenPGP Usage
-# URL:		http://www.xmpp.org/extensions/xep-0027.html
+# URL:		http://xmpp.org/extensions/xep-0027.html
 # STATUS:	Active
 # TYPE:		Historical
 # DATE:		2006-11-29
@@ -203,7 +118,7 @@ stored
 # --------------------------------------------------------------------
 # XEP:		XEP-0030
 # NAME:		Service Discovery
-# URL:		http://www.xmpp.org/extensions/xep-0030.html
+# URL:		http://xmpp.org/extensions/xep-0030.html
 # STATUS:	Final
 # TYPE:		Standards Track
 # DATE:		2008-06-06
@@ -220,114 +135,34 @@ node
 jid
 name
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0033
-# NAME:		Extended Stanza Addressing
-# URL:		http://www.xmpp.org/extensions/xep-0033.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2004-09-16
-
-# http://jabber.org/protocol/address
-delivered
-desc
-jid
-node
-type
-uri
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0045
-# NAME:		Multi-User Chat
-# URL:		http://www.xmpp.org/extensions/xep-0045.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2008-07-16
-
-# http://jabber.org/protocol/muc
-maxchars
-maxstanzas
-seconds
-since
-
-# http://jabber.org/protocol/muc#admin
-affiliation
-jid
-nick
-role
-
-# http://jabber.org/protocol/muc#owner
-jid
-
-# http://jabber.org/protocol/muc#unique
-
-# http://jabber.org/protocol/muc#user
-from
-to
-jid
-affiliation
-nick
-role
-thread
-code
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0047
-# NAME:		In-Band Bytestreams (IBB)
-# URL:		http://www.xmpp.org/extensions/xep-0047.html
-# STATUS:	Draft
+# NAME:		In-Band Bytestreams
+# URL:		http://xmpp.org/extensions/xep-0047.html
+# STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2006-11-29
+# DATE:		2012-06-22
 
 # http://jabber.org/protocol/ibb
-sid
 block-size
+sid
+stanza
 seq
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0048
-# NAME:		Bookmarks
-# URL:		http://www.xmpp.org/extensions/xep-0048.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-11-07
-
-# storage:bookmarks
-autojoin
-jid
-name
-url
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0049
 # NAME:		Private XML Storage
-# URL:		http://www.xmpp.org/extensions/xep-0049.html
+# URL:		http://xmpp.org/extensions/xep-0049.html
 # STATUS:	Active
 # TYPE:		Historical
 # DATE:		2004-03-01
 
 # jabber:iq:private
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0050
-# NAME:		Ad-Hoc Commands
-# URL:		http://www.xmpp.org/extensions/xep-0050.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2005-06-30
-
-# http://jabber.org/protocol/commands
-action
-node
-sessionid
-status
-execute
-type
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0054
 # NAME:		vcard-temp
-# URL:		http://www.xmpp.org/extensions/xep-0054.html
+# URL:		http://xmpp.org/extensions/xep-0054.html
 # STATUS:	Active
 # TYPE:		Historical
 # DATE:		2008-07-16
@@ -337,255 +172,50 @@ type
 # --------------------------------------------------------------------
 # XEP:		XEP-0055
 # NAME:		Jabber Search
-# URL:		http://www.xmpp.org/extensions/xep-0055.html
+# URL:		http://xmpp.org/extensions/xep-0055.html
 # STATUS:	Active
 # TYPE:		Historical
-# DATE:		2004-03-22
+# DATE:		2009-09-15
 
 # jabber:iq:search
 jid
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0059
-# NAME:		Result Set Management
-# URL:		http://www.xmpp.org/extensions/xep-0059.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2006-09-20
-
-# http://jabber.org/protocol/rsm
-index
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0060
-# NAME:		Publish-Subscribe
-# URL:		http://www.xmpp.org/extensions/xep-0060.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2008-03-05
-
-# http://jabber.org/protocol/pubsub
-affiliation
-node
-max_items
-subid
-id
-jid
-notify
-subscription
-
-# http://jabber.org/protocol/pubsub#errors
-feature
-
-# http://jabber.org/protocol/pubsub#event
-node
-id
-expiry
-jid
-subid
-subscription
-
-# http://jabber.org/protocol/pubsub#owner
-node
-affiliation
-jid
-subscription
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0065
-# NAME:		SOCKS5 Bytestreams
-# URL:		http://www.xmpp.org/extensions/xep-0065.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-05-21
-
-# http://jabber.org/protocol/bytestreams
-sid
-mode
-jid
-host
-zeroconf
-port
-dstaddr
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0066
-# NAME:		Out of Band Data
-# URL:		http://www.xmpp.org/extensions/xep-0066.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2006-08-16
-
-# jabber:iq:oob
-sid
-
-# jabber:x:oob
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0070
-# NAME:		Verifying HTTP Requests via XMPP
-# URL:		http://www.xmpp.org/extensions/xep-0070.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2005-12-14
-
-# http://jabber.org/protocol/http-auth
-id
-method
-url
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0071
-# NAME:		XHTML-IM
-# URL:		http://www.xmpp.org/extensions/xep-0071.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-08-29
-
-# http://jabber.org/protocol/xhtml-im
-
-# http://www.w3.org/1999/xhtml
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0072
-# NAME:		SOAP Over XMPP
-# URL:		http://www.xmpp.org/extensions/xep-0072.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2005-12-14
-
-# http://jabber.org/protocol/soap#fault
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0077
 # NAME:		In-Band Registration
-# URL:		http://www.xmpp.org/extensions/xep-0077.html
+# URL:		http://xmpp.org/extensions/xep-0077.html
 # STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2006-01-24
+# DATE:		2012-01-25
 
 # http://jabber.org/features/iq-register
 
 # jabber:iq:register
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0078
-# NAME:		Non-SASL Authentication
-# URL:		http://www.xmpp.org/extensions/xep-0078.html
-# STATUS:	Deprecated
-# TYPE:		Standards Track
-# DATE:		2008-01-30
-
-# http://jabber.org/features/iq-auth
-
-# jabber:iq:auth
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0079
-# NAME:		Advanced Message Processing
-# URL:		http://www.xmpp.org/extensions/xep-0079.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2005-11-30
-
-# http://jabber.org/features/amp
-
-# http://jabber.org/protocol/amp
-from
-per-hop
-status
-to
-action
-condition
-value
-
-# http://jabber.org/protocol/amp#errors
-action
-condition
-value
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0080
-# NAME:		User Location
-# URL:		http://www.xmpp.org/extensions/xep-0080.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2008-01-30
-
-# http://jabber.org/protocol/geoloc
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0083
 # NAME:		Nested Roster Groups
-# URL:		http://www.xmpp.org/extensions/xep-0083.html
+# URL:		http://xmpp.org/extensions/xep-0083.html
 # STATUS:	Active
 # TYPE:		Informational
 # DATE:		2004-10-11
 
 # roster:delimiter
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0084
-# NAME:		User Avatar
-# URL:		http://www.xmpp.org/extensions/xep-0084.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-11-07
-
-# urn:xmpp:avatar:metadata
-bytes
-height
-id
-type
-url
-width
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0085
 # NAME:		Chat State Notifications
-# URL:		http://www.xmpp.org/extensions/xep-0085.html
-# STATUS:	Draft
+# URL:		http://xmpp.org/extensions/xep-0085.html
+# STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2006-07-12
+# DATE:		2009-09-23
 
 # http://jabber.org/protocol/chatstates
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0090
-# NAME:		Entity Time
-# URL:		http://www.xmpp.org/extensions/xep-0090.html
-# STATUS:	Deprecated
-# TYPE:		Historical
-# DATE:		2007-03-28
-
-# jabber:iq:time
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0091
-# NAME:		Delayed Delivery
-# URL:		http://www.xmpp.org/extensions/xep-0091.html
-# STATUS:	Deprecated
-# TYPE:		Historical
-# DATE:		2007-03-29
-
-# jabber:x:delay
-from
-stamp
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0092
-# NAME:		Software Version
-# URL:		http://www.xmpp.org/extensions/xep-0092.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-02-16
-
-# jabber:iq:version
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0093
 # NAME:		Roster Item Exchange
-# URL:		http://www.xmpp.org/extensions/xep-0093.html
+# URL:		http://xmpp.org/extensions/xep-0093.html
 # STATUS:	Deprecated
 # TYPE:		Historical
 # DATE:		2005-08-26
@@ -594,167 +224,45 @@ stamp
 jid
 name
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0095
-# NAME:		Stream Initiation
-# URL:		http://www.xmpp.org/extensions/xep-0095.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2004-04-13
-
-# http://jabber.org/protocol/si
-id
-mime-type
-profile
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0096
-# NAME:		File Transfer
-# URL:		http://www.xmpp.org/extensions/xep-0096.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2004-04-13
-
-# http://jabber.org/protocol/si/profile/file-transfer
-date
-hash
-name
-size
-length
-offset
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0100
 # NAME:		Gateway Interaction
-# URL:		http://www.xmpp.org/extensions/xep-0100.html
+# URL:		http://xmpp.org/extensions/xep-0100.html
 # STATUS:	Active
 # TYPE:		Informational
 # DATE:		2005-10-05
 
 # jabber:iq:gateway
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0107
-# NAME:		User Mood
-# URL:		http://www.xmpp.org/extensions/xep-0107.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-06-04
-
-# http://jabber.org/protocol/mood
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0108
-# NAME:		User Activity
-# URL:		http://www.xmpp.org/extensions/xep-0108.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-07-11
-
-# http://jabber.org/protocol/activity
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0114
 # NAME:		Jabber Component Protocol
-# URL:		http://www.xmpp.org/extensions/xep-0114.html
+# URL:		http://xmpp.org/extensions/xep-0114.html
 # STATUS:	Active
 # TYPE:		Historical
-# DATE:		2005-03-03
+# DATE:		2012-01-25
 
 # jabber:component:accept
 from
 id
 to
 type
-code
+by
 
 # jabber:component:connect
 from
 id
 to
 type
-code
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0115
-# NAME:		Entity Capabilities
-# URL:		http://www.xmpp.org/extensions/xep-0115.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2008-02-25
-
-# http://jabber.org/protocol/caps
-ext
-hash
-node
-ver
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0118
-# NAME:		User Tune
-# URL:		http://www.xmpp.org/extensions/xep-0118.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2008-01-30
-
-# http://jabber.org/protocol/tune
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0122
-# NAME:		Data Forms Validation
-# URL:		http://www.xmpp.org/extensions/xep-0122.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2004-09-22
-
-# http://jabber.org/protocol/xdata-validate
-datatype
-min
-max
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0124
-# NAME:		Bidirectional-streams Over Synchronous HTTP (BOSH)
-# URL:		http://www.xmpp.org/extensions/xep-0124.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-02-28
-
-# http://jabber.org/protocol/httpbind
-accept
-ack
-authid
-charsets
-condition
-content
-from
-hold
-inactivity
-key
-maxpause
-newkey
-pause
-polling
-report
-requests
-rid
-route
-secure
-sid
-stream
-time
-to
-type
-ver
-wait
+by
 
 # --------------------------------------------------------------------
 # XEP:		XEP-0130
 # NAME:		Waiting Lists
-# URL:		http://www.xmpp.org/extensions/xep-0130.html
-# STATUS:	Active
+# URL:		http://xmpp.org/extensions/xep-0130.html
+# STATUS:	Deprecated
 # TYPE:		Historical
-# DATE:		2006-09-13
+# DATE:		2012-04-18
 
 # http://jabber.org/protocol/waitinglist
 id
@@ -762,101 +270,22 @@ jid
 type
 scheme
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0131
-# NAME:		Stanza Headers and Internet Metadata (SHIM)
-# URL:		http://www.xmpp.org/extensions/xep-0131.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2006-07-12
-
-# http://jabber.org/protocol/shim
-name
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0136
-# NAME:		Message Archiving
-# URL:		http://www.xmpp.org/extensions/xep-0136.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2008-07-16
-
-# urn:xmpp:archive
-save
-exactmatch
-start
-with
-version
-subject
-thread
-jid
-name
-secs
-utc
-expire
-otr
-unset
-end
-type
-use
-open
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0137
-# NAME:		Publishing SI Requests
-# URL:		http://www.xmpp.org/extensions/xep-0137.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2005-08-26
-
-# http://jabber.org/protocol/sipub
-id
-from
-mime-type
-profile
-sid
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0138
 # NAME:		Stream Compression
-# URL:		http://www.xmpp.org/extensions/xep-0138.html
-# STATUS:	Draft
+# URL:		http://xmpp.org/extensions/xep-0138.html
+# STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2007-09-26
+# DATE:		2009-05-27
 
 # http://jabber.org/features/compress
 
 # http://jabber.org/protocol/compress
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0141
-# NAME:		Data Forms Layout
-# URL:		http://www.xmpp.org/extensions/xep-0141.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2005-05-12
-
-# http://jabber.org/protocol/xdata-layout
-label
-var
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0144
-# NAME:		Roster Item Exchange
-# URL:		http://www.xmpp.org/extensions/xep-0144.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2005-08-26
-
-# http://jabber.org/protocol/rosterx
-action
-jid
-name
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0145
 # NAME:		Annotations
-# URL:		http://www.xmpp.org/extensions/xep-0145.html
+# URL:		http://xmpp.org/extensions/xep-0145.html
 # STATUS:	Active
 # TYPE:		Historical
 # DATE:		2006-03-23
@@ -866,538 +295,133 @@ jid
 cdate
 mdate
 
+# --------------------------------------------------------------------
+# XEP:		XEP-0152
+# NAME:		Reachability Addresses
+# URL:		http://xmpp.org/extensions/xep-0152.html
+# STATUS:	Proposed
+# TYPE:		Standards Track
+# DATE:		2013-09-25
+
+# urn:xmpp:reach:0
+uri
+
 # --------------------------------------------------------------------
 # XEP:		XEP-0153
 # NAME:		vCard-Based Avatars
-# URL:		http://www.xmpp.org/extensions/xep-0153.html
+# URL:		http://xmpp.org/extensions/xep-0153.html
 # STATUS:	Active
 # TYPE:		Historical
 # DATE:		2006-08-16
 
 # vcard-temp:x:update
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0154
-# NAME:		User Profile
-# URL:		http://www.xmpp.org/extensions/xep-0154.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-04-18
-
-# urn:xmpp:tmp:profile
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0158
-# NAME:		Robot Challenges
-# URL:		http://www.xmpp.org/extensions/xep-0158.html
-# STATUS:	Proposed
-# TYPE:		Standards Track
-# DATE:		2008-05-12
-
-# urn:xmpp:tmp:challenge
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0161
-# NAME:		Abuse Reporting
-# URL:		http://www.xmpp.org/extensions/xep-0161.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-05-06
-
-# urn:xmpp:tmp:abuse
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0166
-# NAME:		Jingle
-# URL:		http://www.xmpp.org/extensions/xep-0166.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-07-31
-
-# urn:xmpp:tmp:jingle
-action
-initiator
-responder
-sid
-creator
-name
-senders
-
-# urn:xmpp:tmp:jingle:errors
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0167
-# NAME:		Jingle RTP Sessions
-# URL:		http://www.xmpp.org/extensions/xep-0167.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-07-31
-
-# urn:xmpp:tmp:jingle:apps:rtp
-channels
-clockrate
-id
-maxptime
-name
-ptime
-value
-
-# urn:xmpp:tmp:jingle:apps:rtp:info
-name
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0168
-# NAME:		Resource Application Priority
-# URL:		http://www.xmpp.org/extensions/xep-0168.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-01-23
-
-# http://www.xmpp.org/extensions/xep-0168.html#ns
-ns
-num
-
-# http://www.xmpp.org/extensions/xep-0168.html#ns-route
-ns
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0171
-# NAME:		Language Translation
-# URL:		http://www.xmpp.org/extensions/xep-0171.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2008-05-09
-
-# urn:xmpp:langtrans
-charset
-source_lang
-destination_lang
-dictionary
-engine
-reviewed
-
-# urn:xmpp:langtrans#items
-dictionary
-destination_lang
-engine
-jid
-name
-pivotable
-source_lang
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0172
-# NAME:		User Nickname
-# URL:		http://www.xmpp.org/extensions/xep-0172.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2006-06-05
-
-# http://jabber.org/protocol/nick
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0176
-# NAME:		Jingle ICE-UDP Transport Method
-# URL:		http://www.xmpp.org/extensions/xep-0176.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-07-31
-
-# urn:xmpp:tmp:jingle:transports:ice-udp
-pwd
-ufrag
-component
-foundation
-generation
-ip
-network
-port
-priority
-protocol
-rel-addr
-rel-port
-rem-addr
-rem-port
-type
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0177
-# NAME:		Jingle Raw UDP Transport Method
-# URL:		http://www.xmpp.org/extensions/xep-0177.html
-# STATUS:	Proposed
-# TYPE:		Standards Track
-# DATE:		2007-11-27
-
-# urn:xmpp:tmp:jingle:transports:raw-udp
-generation
-ip
-port
-
-# urn:xmpp:tmp:jingle:transports:raw-udp:info
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0181
-# NAME:		Jingle DTMF
-# URL:		http://www.xmpp.org/extensions/xep-0181.html
-# STATUS:	Proposed
-# TYPE:		Standards Track
-# DATE:		2008-05-30
-
-# urn:xmpp:tmp:jingle:dtmf
-code
-duration
-volume
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0184
-# NAME:		Message Receipts
-# URL:		http://www.xmpp.org/extensions/xep-0184.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-09-26
-
-# urn:xmpp:receipts
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0186
-# NAME:		Invisible Command
-# URL:		http://www.xmpp.org/extensions/xep-0186.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-05-12
-
-# urn:xmpp:tmp:invisible
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0189
-# NAME:		Public Key Publishing
-# URL:		http://www.xmpp.org/extensions/xep-0189.html
-# STATUS:	Proposed
-# TYPE:		Standards Track
-# DATE:		2008-03-05
-
-# urn:xmpp:tmp:pubkey
-jid
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0191
-# NAME:		Simple Communications Blocking
-# URL:		http://www.xmpp.org/extensions/xep-0191.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-02-15
-
-# urn:xmpp:blocking
-jid
-
-# urn:xmpp:blocking:errors
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0192
-# NAME:		Proposed Stream Feature Improvements
-# URL:		http://www.xmpp.org/extensions/xep-0192.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-01-17
-
-# urn:ietf:params:xml:ns:xmpp-bind
-
-# urn:ietf:params:xml:ns:xmpp-sasl
-mechanism
-
-# urn:xmpp:features:dialback
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0193
-# NAME:		Proposed Resource Binding Improvements
-# URL:		http://www.xmpp.org/extensions/xep-0193.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-01-17
-
-# urn:ietf:params:xml:ns:xmpp-bind
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0194
-# NAME:		User Chatting
-# URL:		http://www.xmpp.org/extensions/xep-0194.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-10-02
-
-# http://www.xmpp.org/extensions/xep-0194.html#ns
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0195
-# NAME:		User Browsing
-# URL:		http://www.xmpp.org/extensions/xep-0195.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-10-02
-
-# http://www.xmpp.org/extensions/xep-0195.html#ns
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0196
-# NAME:		User Gaming
-# URL:		http://www.xmpp.org/extensions/xep-0196.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-10-02
-
-# http://www.xmpp.org/extensions/xep-0196.html#ns
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0197
-# NAME:		User Viewing
-# URL:		http://www.xmpp.org/extensions/xep-0197.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-10-02
-
-# http://www.xmpp.org/extensions/xep-0197.html#ns
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0198
-# NAME:		Stanza Acknowledgements
-# URL:		http://www.xmpp.org/extensions/xep-0198.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-10-03
-
-# http://www.xmpp.org/extensions/xep-0198.html#ns
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0199
 # NAME:		XMPP Ping
-# URL:		http://www.xmpp.org/extensions/xep-0199.html
-# STATUS:	Draft
+# URL:		http://xmpp.org/extensions/xep-0199.html
+# STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2007-06-12
+# DATE:		2009-06-03
 
 # urn:xmpp:ping
 
 # --------------------------------------------------------------------
 # XEP:		XEP-0202
 # NAME:		Entity Time
-# URL:		http://www.xmpp.org/extensions/xep-0202.html
-# STATUS:	Draft
+# URL:		http://xmpp.org/extensions/xep-0202.html
+# STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2007-03-28
+# DATE:		2009-09-11
 
 # urn:xmpp:time
 
 # --------------------------------------------------------------------
 # XEP:		XEP-0203
 # NAME:		Delayed Delivery
-# URL:		http://www.xmpp.org/extensions/xep-0203.html
-# STATUS:	Draft
+# URL:		http://xmpp.org/extensions/xep-0203.html
+# STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2007-03-29
+# DATE:		2009-09-15
 
 # urn:xmpp:delay
 from
 stamp
 
 # --------------------------------------------------------------------
-# XEP:		XEP-0206
-# NAME:		XMPP Over BOSH
-# URL:		http://www.xmpp.org/extensions/xep-0206.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-06-04
-
-# urn:xmpp:xbosh
-restart
-version
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0208
-# NAME:		Bootstrapping Implementation of Jingle
-# URL:		http://www.xmpp.org/extensions/xep-0208.html
-# STATUS:	Experimental
-# TYPE:		Informational
-# DATE:		2008-01-23
-
-# http://www.xmpp.org/extensions/xep-0208.html#ns
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0209
-# NAME:		Metacontacts
-# URL:		http://www.xmpp.org/extensions/xep-0209.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-04-10
-
-# storage:metacontacts
-jid
-tag
-order
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0215
-# NAME:		External Service Discovery
-# URL:		http://www.xmpp.org/extensions/xep-0215.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-08-30
-
-# http://www.xmpp.org/extensions/xep-0215.html#ns
-type
-host
-name
-password
-port
-transport
-username
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0220
-# NAME:		Server Dialback
-# URL:		http://www.xmpp.org/extensions/xep-0220.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-06-18
-
-# jabber:server:dialback
-from
-to
-type
-id
-
-# urn:xmpp:features:dialback
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0221
-# NAME:		Data Forms Media Element
-# URL:		http://www.xmpp.org/extensions/xep-0221.html
+# XEP:		XEP-0301
+# NAME:		In-Band Real Time Text
+# URL:		http://xmpp.org/extensions/xep-0301.html
 # STATUS:	Proposed
 # TYPE:		Standards Track
-# DATE:		2008-06-18
-
-# urn:xmpp:tmp:media-element
-height
-width
-type
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0224
-# NAME:		Attention
-# URL:		http://www.xmpp.org/extensions/xep-0224.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-08-08
+# DATE:		2013-09-25
 
-# http://www.xmpp.org/extensions/xep-0224.html#ns
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0225
-# NAME:		Component Connections
-# URL:		http://www.xmpp.org/extensions/xep-0225.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-08-08
-
-# urn:xmpp:tmp:component
+# urn:xmpp:rtt:0
+seq
+event
+id
+p
+n
 
 # --------------------------------------------------------------------
-# XEP:		XEP-0227
-# NAME:		Portable Import/Export Format for XMPP-IM Servers
-# URL:		http://www.xmpp.org/extensions/xep-0227.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-12-13
+# XEP:		TBD1
+# NAME:		OCCI Schema
+# URL:		http://redmine.ogf.org/projects/occi-wg/repository/revisions/xml-data-format/raw/schemas/occi.xsd
 
-# http://www.xmpp.org/extensions/xep-0227.html#ns
-jid
+# http://schemas.ogf.org/occi
 name
-password
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0231
-# NAME:		Data Element
-# URL:		http://www.xmpp.org/extensions/xep-0231.html
-# STATUS:	Proposed
-# TYPE:		Standards Track
-# DATE:		2008-06-18
-
-# urn:xmpp:tmp:data-element
-alt
-cid
-type
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0233
-# NAME:		Use of Domain-Based Service Names in XMPP SASL Negotiation
-# URL:		http://www.xmpp.org/extensions/xep-0233.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-01-30
-
-# urn:xmpp:tmp:domain-based-name
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0234
-# NAME:		Jingle File Transfer
-# URL:		http://www.xmpp.org/extensions/xep-0234.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-06-05
-
-# urn:xmpp:tmp:jingle:apps:file-transfer
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0235
-# NAME:		Authorization Tokens
-# URL:		http://www.xmpp.org/extensions/xep-0235.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-03-31
-
-# urn:xmpp:tmp:auth-token
-consumer
-expires
-node
-service
+version
+scheme
+location
+immutable
+minOccurs
+maxOccurs
+target
+source
+id
+title
+value
+term
+use
+uri
 
 # --------------------------------------------------------------------
-# XEP:		XEP-0237
-# NAME:		Roster Sequencing
-# URL:		http://www.xmpp.org/extensions/xep-0237.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-04-21
+# XEP:		TBD2
+# NAME:		XMLSchema schema
+# URL:		http://www.w3.org/2001/XMLSchema.xsd
 
-# jabber:iq:roster
-sequence
-ask
-jid
+# http://www.w3.org/2001/XMLSchema
+id
+targetNamespace
+version
+finalDefault
+blockDefault
+attributeFormDefault
+elementFormDefault
+minOccurs
+maxOccurs
 name
-subscription
-
-# urn:xmpp:tmp:roster-sequencing
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0244
-# NAME:		IO Data
-# URL:		http://www.xmpp.org/extensions/xep-0244.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-06-18
-
-# urn:xmpp:tmp:io-data
+ref
 type
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0247
-# NAME:		Jingle XML Streams
-# URL:		http://www.xmpp.org/extensions/xep-0247.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-06-18
-
-# urn:xmpp:tmp:jingle:apps:xmlstream
-authentication
-disclosure
-logging
-tls
+use
+default
+fixed
+form
+mixed
+abstract
+final
+block
+base
+substitutionGroup
+nillable
+namespace
+processContents
+schemaLocation
+xpath
+refer
+public
+system
+source
+itemType
+memberTypes
+value
diff --git a/include/internal/exmpp_known_elems.hrl.es b/include/internal/exmpp_known_elems.hrl.es
new file mode 100755
index 0000000..a9327fa
--- /dev/null
+++ b/include/internal/exmpp_known_elems.hrl.es
@@ -0,0 +1,28 @@
+#!/usr/bin/env escript
+%% -*- erlang -*-
+
+main([ Known_ELEMS_Src ]) ->
+    io:format("% Generated by ~p~n", [filename:basename(escript:script_name())]),
+    Elements = lists:usort(read_elems(Known_ELEMS_Src)),
+    io:format("-define(XMPP_KNOWN_ELEMS,~n"
+              "        ~p).~n~n",
+              [ [ binary_to_atom(EL, utf8)
+                  || EL <- Elements ] ]),
+    timer:sleep(10).
+
+read_elems(Known_ELEMS_Src) ->
+    {ok, File} = file:open(Known_ELEMS_Src, [read, binary]),
+    read_elems(File, io:get_line(File, ""), []).
+
+read_elems(File, eof, Acc) ->
+    file:close(File),
+    lists:reverse(Acc);
+read_elems(File, << $#, _/binary >>, Acc) ->
+    read_elems(File, io:get_line(File, ""), Acc);
+read_elems(File, << $\n >>, Acc) ->
+    read_elems(File, io:get_line(File, ""), Acc);
+read_elems(File, EL_bin, Acc) when is_binary(EL_bin) ->
+    Len = byte_size(EL_bin) - 1,
+    << EL:Len/binary, _/binary >> = EL_bin,
+    read_elems(File, io:get_line(File, ""),
+	       [EL | Acc]).
diff --git a/include/internal/exmpp_known_elems.in b/include/internal/exmpp_known_elems.in
index 53ec143..7cea17a 100644
--- a/include/internal/exmpp_known_elems.in
+++ b/include/internal/exmpp_known_elems.in
@@ -1,4 +1,4 @@
-# Generated by extract-known-from-specs r560 on 2008-08-01T09:50:15Z
+# Generated by extract-known-from-specs r0 on 2013-10-08T15:22:55Z
 # vim:ft=conf:
 
 # --------------------------------------------------------------------
@@ -152,27 +152,10 @@ decryption-failed
 signature-unverified
 bad-timestamp
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0003
-# NAME:		Proxy Accept Socket Service (PASS)
-# URL:		http://www.xmpp.org/extensions/xep-0003.html
-# STATUS:	Deprecated
-# TYPE:		Historical
-# DATE:		2007-01-17
-
-# jabber:iq:pass
-query
-client
-close
-expire
-oneshot
-proxy
-server
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0004
 # NAME:		Data Forms
-# URL:		http://www.xmpp.org/extensions/xep-0004.html
+# URL:		http://xmpp.org/extensions/xep-0004.html
 # STATUS:	Final
 # TYPE:		Standards Track
 # DATE:		2007-08-13
@@ -192,10 +175,10 @@ item
 # --------------------------------------------------------------------
 # XEP:		XEP-0009
 # NAME:		Jabber-RPC
-# URL:		http://www.xmpp.org/extensions/xep-0009.html
+# URL:		http://xmpp.org/extensions/xep-0009.html
 # STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2006-02-09
+# DATE:		2011-11-10
 
 # jabber:iq:rpc
 query
@@ -212,110 +195,28 @@ i4
 int
 string
 double
-Base64
+base64
 boolean
 dateTime.iso8601
 array
 name
 data
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0011
-# NAME:		Jabber Browsing
-# URL:		http://www.xmpp.org/extensions/xep-0011.html
-# STATUS:	Deprecated
-# TYPE:		Historical
-# DATE:		2004-11-12
-
-# jabber:iq:browse
-query
-item
-ns
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0012
 # NAME:		Last Activity
-# URL:		http://www.xmpp.org/extensions/xep-0012.html
-# STATUS:	Draft
+# URL:		http://xmpp.org/extensions/xep-0012.html
+# STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2008-07-16
+# DATE:		2008-11-26
 
 # jabber:iq:last
 query
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0013
-# NAME:		Flexible Offline Message Retrieval
-# URL:		http://www.xmpp.org/extensions/xep-0013.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2005-07-14
-
-# http://jabber.org/protocol/offline
-offline
-item
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0016
-# NAME:		Privacy Lists
-# URL:		http://www.xmpp.org/extensions/xep-0016.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-02-15
-
-# jabber:iq:privacy
-query
-active
-default
-list
-item
-iq
-message
-presence-in
-presence-out
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0020
-# NAME:		Feature Negotiation
-# URL:		http://www.xmpp.org/extensions/xep-0020.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2006-11-21
-
-# http://jabber.org/protocol/feature-neg
-feature
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0022
-# NAME:		Message Events
-# URL:		http://www.xmpp.org/extensions/xep-0022.html
-# STATUS:	Deprecated
-# TYPE:		Historical
-# DATE:		2007-09-26
-
-# jabber:x:event
-x
-offline
-delivered
-displayed
-composing
-id
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0023
-# NAME:		Message Expiration
-# URL:		http://www.xmpp.org/extensions/xep-0023.html
-# STATUS:	Deprecated
-# TYPE:		Historical
-# DATE:		2004-10-18
-
-# jabber:x:expire
-x
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0027
 # NAME:		Current Jabber OpenPGP Usage
-# URL:		http://www.xmpp.org/extensions/xep-0027.html
+# URL:		http://xmpp.org/extensions/xep-0027.html
 # STATUS:	Active
 # TYPE:		Historical
 # DATE:		2006-11-29
@@ -329,7 +230,7 @@ x
 # --------------------------------------------------------------------
 # XEP:		XEP-0030
 # NAME:		Service Discovery
-# URL:		http://www.xmpp.org/extensions/xep-0030.html
+# URL:		http://xmpp.org/extensions/xep-0030.html
 # STATUS:	Final
 # TYPE:		Standards Track
 # DATE:		2008-06-06
@@ -343,90 +244,23 @@ feature
 query
 item
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0033
-# NAME:		Extended Stanza Addressing
-# URL:		http://www.xmpp.org/extensions/xep-0033.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2004-09-16
-
-# http://jabber.org/protocol/address
-addresses
-address
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0045
-# NAME:		Multi-User Chat
-# URL:		http://www.xmpp.org/extensions/xep-0045.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2008-07-16
-
-# http://jabber.org/protocol/muc
-x
-password
-history
-
-# http://jabber.org/protocol/muc#admin
-query
-item
-actor
-reason
-
-# http://jabber.org/protocol/muc#owner
-query
-destroy
-password
-reason
-
-# http://jabber.org/protocol/muc#unique
-unique
-
-# http://jabber.org/protocol/muc#user
-x
-password
-decline
-destroy
-invite
-item
-actor
-continue
-status
-reason
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0047
-# NAME:		In-Band Bytestreams (IBB)
-# URL:		http://www.xmpp.org/extensions/xep-0047.html
-# STATUS:	Draft
+# NAME:		In-Band Bytestreams
+# URL:		http://xmpp.org/extensions/xep-0047.html
+# STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2006-11-29
+# DATE:		2012-06-22
 
 # http://jabber.org/protocol/ibb
 open
 close
 data
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0048
-# NAME:		Bookmarks
-# URL:		http://www.xmpp.org/extensions/xep-0048.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-11-07
-
-# storage:bookmarks
-storage
-conference
-nick
-password
-url
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0049
 # NAME:		Private XML Storage
-# URL:		http://www.xmpp.org/extensions/xep-0049.html
+# URL:		http://xmpp.org/extensions/xep-0049.html
 # STATUS:	Active
 # TYPE:		Historical
 # DATE:		2004-03-01
@@ -434,124 +268,23 @@ url
 # jabber:iq:private
 query
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0050
-# NAME:		Ad-Hoc Commands
-# URL:		http://www.xmpp.org/extensions/xep-0050.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2005-06-30
-
-# http://jabber.org/protocol/commands
-command
-actions
-prev
-next
-complete
-note
-bad-action
-bad-locale
-bad-payload
-bad-sessionid
-malformed-action
-session-expired
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0054
 # NAME:		vcard-temp
-# URL:		http://www.xmpp.org/extensions/xep-0054.html
+# URL:		http://xmpp.org/extensions/xep-0054.html
 # STATUS:	Active
 # TYPE:		Historical
 # DATE:		2008-07-16
 
 # vcard-temp
-xCard
-vCard
-VERSION
-FN
-N
-FAMILY
-GIVEN
-MIDDLE
-PREFIX
-SUFFIX
-NICKNAME
-PHOTO
-BDAY
-ADR
-POBOX
-EXTADD
-STREET
-LOCALITY
-REGION
-PCODE
-CTRY
-LABEL
-LINE
-TEL
-NUMBER
-EMAIL
-USERID
-JABBERID
-MAILER
-TZ
-GEO
-LAT
-LON
-TITLE
-ROLE
-LOGO
-AGENT
-ORG
-ORGNAME
-ORGUNIT
-CATEGORIES
-KEYWORD
-NOTE
-PRODID
-REV
-SORT-STRING
-SOUND
-PHONETIC
-UID
-URL
-DESC
-CLASS
-PUBLIC
-PRIVATE
-CONFIDENTIAL
-KEY
-CRED
-HOME
-WORK
-POSTAL
-PARCEL
-DOM
-INTL
-PREF
-VOICE
-FAX
-PAGER
-MSG
-CELL
-VIDEO
-BBS
-MODEM
-ISDN
-PCS
-INTERNET
-X400
-TYPE
-BINVAL
-EXTVAL
 
 # --------------------------------------------------------------------
 # XEP:		XEP-0055
 # NAME:		Jabber Search
-# URL:		http://www.xmpp.org/extensions/xep-0055.html
+# URL:		http://xmpp.org/extensions/xep-0055.html
 # STATUS:	Active
 # TYPE:		Historical
-# DATE:		2004-03-22
+# DATE:		2009-09-15
 
 # jabber:iq:search
 query
@@ -562,176 +295,13 @@ nick
 email
 item
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0059
-# NAME:		Result Set Management
-# URL:		http://www.xmpp.org/extensions/xep-0059.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2006-09-20
-
-# http://jabber.org/protocol/rsm
-set
-after
-before
-count
-index
-last
-max
-first
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0060
-# NAME:		Publish-Subscribe
-# URL:		http://www.xmpp.org/extensions/xep-0060.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2008-03-05
-
-# http://jabber.org/protocol/pubsub
-pubsub
-affiliations
-affiliation
-configure
-create
-items
-item
-options
-publish
-retract
-subscribe-options
-required
-subscribe
-subscriptions
-subscription
-unsubscribe
-
-# http://jabber.org/protocol/pubsub#errors
-closed-node
-configuration-required
-invalid-jid
-invalid-options
-invalid-payload
-invalid-subid
-item-forbidden
-item-required
-jid-required
-max-items-exceeded
-max-nodes-exceeded
-nodeid-required
-not-in-roster-group
-not-subscribed
-payload-too-big
-payload-required
-pending-subscription
-presence-subscription-required
-subid-required
-unsupported
-unsupported-access-model
-
-# http://jabber.org/protocol/pubsub#event
-event
-collection
-associate
-disassociate
-configuration
-delete
-items
-item
-purge
-retract
-subscription
-
-# http://jabber.org/protocol/pubsub#owner
-pubsub
-affiliations
-affiliation
-configure
-default
-delete
-purge
-subscriptions
-subscription
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0065
-# NAME:		SOCKS5 Bytestreams
-# URL:		http://www.xmpp.org/extensions/xep-0065.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-05-21
-
-# http://jabber.org/protocol/bytestreams
-query
-activate
-streamhost
-udpsuccess
-streamhost-used
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0066
-# NAME:		Out of Band Data
-# URL:		http://www.xmpp.org/extensions/xep-0066.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2006-08-16
-
-# jabber:iq:oob
-query
-url
-desc
-
-# jabber:x:oob
-x
-url
-desc
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0070
-# NAME:		Verifying HTTP Requests via XMPP
-# URL:		http://www.xmpp.org/extensions/xep-0070.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2005-12-14
-
-# http://jabber.org/protocol/http-auth
-confirm
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0071
-# NAME:		XHTML-IM
-# URL:		http://www.xmpp.org/extensions/xep-0071.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-08-29
-
-# http://jabber.org/protocol/xhtml-im
-html
-
-# http://www.w3.org/1999/xhtml
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0072
-# NAME:		SOAP Over XMPP
-# URL:		http://www.xmpp.org/extensions/xep-0072.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2005-12-14
-
-# http://jabber.org/protocol/soap#fault
-DataEncodingUnknown
-MustUnderstand
-Receiver
-Sender
-VersionMismatch
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0077
 # NAME:		In-Band Registration
-# URL:		http://www.xmpp.org/extensions/xep-0077.html
+# URL:		http://xmpp.org/extensions/xep-0077.html
 # STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2006-01-24
+# DATE:		2012-01-25
 
 # http://jabber.org/features/iq-register
 register
@@ -759,81 +329,10 @@ text
 key
 remove
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0078
-# NAME:		Non-SASL Authentication
-# URL:		http://www.xmpp.org/extensions/xep-0078.html
-# STATUS:	Deprecated
-# TYPE:		Standards Track
-# DATE:		2008-01-30
-
-# http://jabber.org/features/iq-auth
-auth
-
-# jabber:iq:auth
-query
-username
-password
-digest
-resource
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0079
-# NAME:		Advanced Message Processing
-# URL:		http://www.xmpp.org/extensions/xep-0079.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2005-11-30
-
-# http://jabber.org/features/amp
-amp
-
-# http://jabber.org/protocol/amp
-amp
-invalid-rules
-unsupported-actions
-unsupported-conditions
-rule
-
-# http://jabber.org/protocol/amp#errors
-failed-rules
-rule
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0080
-# NAME:		User Location
-# URL:		http://www.xmpp.org/extensions/xep-0080.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2008-01-30
-
-# http://jabber.org/protocol/geoloc
-geoloc
-alt
-area
-bearing
-building
-country
-datum
-description
-error
-floor
-lat
-locality
-lon
-postalcode
-region
-room
-speed
-street
-text
-timestamp
-uri
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0083
 # NAME:		Nested Roster Groups
-# URL:		http://www.xmpp.org/extensions/xep-0083.html
+# URL:		http://xmpp.org/extensions/xep-0083.html
 # STATUS:	Active
 # TYPE:		Informational
 # DATE:		2004-10-11
@@ -841,28 +340,13 @@ uri
 # roster:delimiter
 roster
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0084
-# NAME:		User Avatar
-# URL:		http://www.xmpp.org/extensions/xep-0084.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-11-07
-
-# urn:xmpp:avatar:metadata
-data
-metadata
-stop
-info
-pointer
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0085
 # NAME:		Chat State Notifications
-# URL:		http://www.xmpp.org/extensions/xep-0085.html
-# STATUS:	Draft
+# URL:		http://xmpp.org/extensions/xep-0085.html
+# STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2006-07-12
+# DATE:		2009-09-23
 
 # http://jabber.org/protocol/chatstates
 active
@@ -871,49 +355,10 @@ gone
 inactive
 paused
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0090
-# NAME:		Entity Time
-# URL:		http://www.xmpp.org/extensions/xep-0090.html
-# STATUS:	Deprecated
-# TYPE:		Historical
-# DATE:		2007-03-28
-
-# jabber:iq:time
-query
-utc
-tz
-display
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0091
-# NAME:		Delayed Delivery
-# URL:		http://www.xmpp.org/extensions/xep-0091.html
-# STATUS:	Deprecated
-# TYPE:		Historical
-# DATE:		2007-03-29
-
-# jabber:x:delay
-x
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0092
-# NAME:		Software Version
-# URL:		http://www.xmpp.org/extensions/xep-0092.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-02-16
-
-# jabber:iq:version
-query
-name
-version
-os
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0093
 # NAME:		Roster Item Exchange
-# URL:		http://www.xmpp.org/extensions/xep-0093.html
+# URL:		http://xmpp.org/extensions/xep-0093.html
 # STATUS:	Deprecated
 # TYPE:		Historical
 # DATE:		2005-08-26
@@ -923,36 +368,10 @@ x
 item
 group
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0095
-# NAME:		Stream Initiation
-# URL:		http://www.xmpp.org/extensions/xep-0095.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2004-04-13
-
-# http://jabber.org/protocol/si
-si
-bad-profile
-no-valid-streams
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0096
-# NAME:		File Transfer
-# URL:		http://www.xmpp.org/extensions/xep-0096.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2004-04-13
-
-# http://jabber.org/protocol/si/profile/file-transfer
-file
-desc
-range
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0100
 # NAME:		Gateway Interaction
-# URL:		http://www.xmpp.org/extensions/xep-0100.html
+# URL:		http://xmpp.org/extensions/xep-0100.html
 # STATUS:	Active
 # TYPE:		Informational
 # DATE:		2005-10-05
@@ -963,170 +382,13 @@ desc
 prompt
 jid
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0107
-# NAME:		User Mood
-# URL:		http://www.xmpp.org/extensions/xep-0107.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-06-04
-
-# http://jabber.org/protocol/mood
-mood
-afraid
-amazed
-angry
-annoyed
-anxious
-aroused
-ashamed
-bored
-brave
-calm
-cold
-confused
-contented
-cranky
-curious
-depressed
-disappointed
-disgusted
-distracted
-embarrassed
-excited
-flirtatious
-frustrated
-grumpy
-guilty
-happy
-hot
-humbled
-humiliated
-hungry
-hurt
-impressed
-in_awe
-in_love
-indignant
-interested
-intoxicated
-invincible
-jealous
-lonely
-mean
-moody
-nervous
-neutral
-offended
-playful
-proud
-relieved
-remorseful
-restless
-sad
-sarcastic
-serious
-shocked
-shy
-sick
-sleepy
-stressed
-surprised
-thirsty
-worried
-text
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0108
-# NAME:		User Activity
-# URL:		http://www.xmpp.org/extensions/xep-0108.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-07-11
-
-# http://jabber.org/protocol/activity
-activity
-doing_chores
-drinking
-eating
-exercising
-grooming
-having_appointment
-inactive
-relaxing
-talking
-traveling
-working
-text
-at_the_spa
-brushing_teeth
-buying_groceries
-cleaning
-coding
-commuting
-cooking
-cycling
-day_off
-doing_maintenance
-doing_the_dishes
-doing_the_laundry
-driving
-gaming
-gardening
-getting_a_haircut
-going_out
-hanging_out
-having_a_beer
-having_a_snack
-having_breakfast
-having_coffee
-having_dinner
-having_lunch
-having_tea
-hiking
-in_a_car
-in_a_meeting
-in_real_life
-jogging
-on_a_bus
-on_a_plane
-on_a_train
-on_a_trip
-on_the_phone
-on_vacation
-on_video_phone
-other
-partying
-playing_sports
-reading
-rehearsing
-running
-running_an_errand
-scheduled_holiday
-shaving
-shopping
-skiing
-sleeping
-socializing
-studying
-sunbathing
-swimming
-taking_a_bath
-taking_a_shower
-walking
-walking_the_dog
-watching_tv
-watching_a_movie
-working_out
-writing
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0114
 # NAME:		Jabber Component Protocol
-# URL:		http://www.xmpp.org/extensions/xep-0114.html
+# URL:		http://xmpp.org/extensions/xep-0114.html
 # STATUS:	Active
 # TYPE:		Historical
-# DATE:		2005-03-03
+# DATE:		2012-01-25
 
 # jabber:component:accept
 handshake
@@ -1154,69 +416,13 @@ priority
 iq
 error
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0115
-# NAME:		Entity Capabilities
-# URL:		http://www.xmpp.org/extensions/xep-0115.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2008-02-25
-
-# http://jabber.org/protocol/caps
-c
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0118
-# NAME:		User Tune
-# URL:		http://www.xmpp.org/extensions/xep-0118.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2008-01-30
-
-# http://jabber.org/protocol/tune
-tune
-artist
-length
-rating
-source
-title
-track
-uri
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0122
-# NAME:		Data Forms Validation
-# URL:		http://www.xmpp.org/extensions/xep-0122.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2004-09-22
-
-# http://jabber.org/protocol/xdata-validate
-validate
-basic
-open
-range
-regex
-list-range
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0124
-# NAME:		Bidirectional-streams Over Synchronous HTTP (BOSH)
-# URL:		http://www.xmpp.org/extensions/xep-0124.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-02-28
-
-# http://jabber.org/protocol/httpbind
-body
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0130
 # NAME:		Waiting Lists
-# URL:		http://www.xmpp.org/extensions/xep-0130.html
-# STATUS:	Active
+# URL:		http://xmpp.org/extensions/xep-0130.html
+# STATUS:	Deprecated
 # TYPE:		Historical
-# DATE:		2006-09-13
+# DATE:		2012-04-18
 
 # http://jabber.org/protocol/waitinglist
 waitlist
@@ -1226,70 +432,13 @@ uri
 name
 remove
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0131
-# NAME:		Stanza Headers and Internet Metadata (SHIM)
-# URL:		http://www.xmpp.org/extensions/xep-0131.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2006-07-12
-
-# http://jabber.org/protocol/shim
-headers
-header
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0136
-# NAME:		Message Archiving
-# URL:		http://www.xmpp.org/extensions/xep-0136.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2008-07-16
-
-# urn:xmpp:archive
-auto
-changed
-chat
-from
-next
-previous
-to
-body
-default
-feature
-optional
-item
-list
-method
-modified
-note
-pref
-itemremove
-remove
-removed
-retrieve
-save
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0137
-# NAME:		Publishing SI Requests
-# URL:		http://www.xmpp.org/extensions/xep-0137.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2005-08-26
-
-# http://jabber.org/protocol/sipub
-sipub
-start
-starting
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0138
 # NAME:		Stream Compression
-# URL:		http://www.xmpp.org/extensions/xep-0138.html
-# STATUS:	Draft
+# URL:		http://xmpp.org/extensions/xep-0138.html
+# STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2007-09-26
+# DATE:		2009-05-27
 
 # http://jabber.org/features/compress
 compression
@@ -1304,38 +453,10 @@ setup-failed
 processing-failed
 unsupported-method
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0141
-# NAME:		Data Forms Layout
-# URL:		http://www.xmpp.org/extensions/xep-0141.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2005-05-12
-
-# http://jabber.org/protocol/xdata-layout
-page
-section
-fieldref
-reportedref
-text
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0144
-# NAME:		Roster Item Exchange
-# URL:		http://www.xmpp.org/extensions/xep-0144.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2005-08-26
-
-# http://jabber.org/protocol/rosterx
-x
-item
-group
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0145
 # NAME:		Annotations
-# URL:		http://www.xmpp.org/extensions/xep-0145.html
+# URL:		http://xmpp.org/extensions/xep-0145.html
 # STATUS:	Active
 # TYPE:		Historical
 # DATE:		2006-03-23
@@ -1344,10 +465,23 @@ group
 storage
 note
 
+# --------------------------------------------------------------------
+# XEP:		XEP-0152
+# NAME:		Reachability Addresses
+# URL:		http://xmpp.org/extensions/xep-0152.html
+# STATUS:	Proposed
+# TYPE:		Standards Track
+# DATE:		2013-09-25
+
+# urn:xmpp:reach:0
+reach
+addr
+desc
+
 # --------------------------------------------------------------------
 # XEP:		XEP-0153
 # NAME:		vCard-Based Avatars
-# URL:		http://www.xmpp.org/extensions/xep-0153.html
+# URL:		http://xmpp.org/extensions/xep-0153.html
 # STATUS:	Active
 # TYPE:		Historical
 # DATE:		2006-08-16
@@ -1356,384 +490,13 @@ note
 x
 photo
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0154
-# NAME:		User Profile
-# URL:		http://www.xmpp.org/extensions/xep-0154.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-04-18
-
-# urn:xmpp:tmp:profile
-profile
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0158
-# NAME:		Robot Challenges
-# URL:		http://www.xmpp.org/extensions/xep-0158.html
-# STATUS:	Proposed
-# TYPE:		Standards Track
-# DATE:		2008-05-12
-
-# urn:xmpp:tmp:challenge
-challenge
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0161
-# NAME:		Abuse Reporting
-# URL:		http://www.xmpp.org/extensions/xep-0161.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-05-06
-
-# urn:xmpp:tmp:abuse
-abuse
-condition
-gateway
-muc
-proxy
-pubsub
-service
-spam
-stanza-too-big
-too-many-recipients
-too-many-stanzas
-unacceptable-payload
-unacceptable-text
-undefined-abuse
-stanzas
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0166
-# NAME:		Jingle
-# URL:		http://www.xmpp.org/extensions/xep-0166.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-07-31
-
-# urn:xmpp:tmp:jingle
-jingle
-alternative-session
-busy
-connectivity-error
-decline
-general-error
-invalid-credentials
-media-error
-no-error
-success
-unsupported-applications
-unsupported-transports
-sid
-text
-
-# urn:xmpp:tmp:jingle:errors
-out-of-order
-unknown-session
-unsupported-info
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0167
-# NAME:		Jingle RTP Sessions
-# URL:		http://www.xmpp.org/extensions/xep-0167.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-07-31
-
-# urn:xmpp:tmp:jingle:apps:rtp
-description
-payload-type
-crypto
-parameter
-
-# urn:xmpp:tmp:jingle:apps:rtp:info
-active
-hold
-mute
-ringing
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0168
-# NAME:		Resource Application Priority
-# URL:		http://www.xmpp.org/extensions/xep-0168.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-01-23
-
-# http://www.xmpp.org/extensions/xep-0168.html#ns
-rap
-primary
-
-# http://www.xmpp.org/extensions/xep-0168.html#ns-route
-route
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0171
-# NAME:		Language Translation
-# URL:		http://www.xmpp.org/extensions/xep-0171.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2008-05-09
-
-# urn:xmpp:langtrans
-x
-source
-translation
-
-# urn:xmpp:langtrans#items
-query
-item
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0172
-# NAME:		User Nickname
-# URL:		http://www.xmpp.org/extensions/xep-0172.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2006-06-05
-
-# http://jabber.org/protocol/nick
-nick
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0176
-# NAME:		Jingle ICE-UDP Transport Method
-# URL:		http://www.xmpp.org/extensions/xep-0176.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-07-31
-
-# urn:xmpp:tmp:jingle:transports:ice-udp
-transport
-candidate
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0177
-# NAME:		Jingle Raw UDP Transport Method
-# URL:		http://www.xmpp.org/extensions/xep-0177.html
-# STATUS:	Proposed
-# TYPE:		Standards Track
-# DATE:		2007-11-27
-
-# urn:xmpp:tmp:jingle:transports:raw-udp
-transport
-candidate
-
-# urn:xmpp:tmp:jingle:transports:raw-udp:info
-received
-trying
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0181
-# NAME:		Jingle DTMF
-# URL:		http://www.xmpp.org/extensions/xep-0181.html
-# STATUS:	Proposed
-# TYPE:		Standards Track
-# DATE:		2008-05-30
-
-# urn:xmpp:tmp:jingle:dtmf
-dtmf
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0184
-# NAME:		Message Receipts
-# URL:		http://www.xmpp.org/extensions/xep-0184.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-09-26
-
-# urn:xmpp:receipts
-received
-request
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0186
-# NAME:		Invisible Command
-# URL:		http://www.xmpp.org/extensions/xep-0186.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-05-12
-
-# urn:xmpp:tmp:invisible
-invisible
-visible
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0189
-# NAME:		Public Key Publishing
-# URL:		http://www.xmpp.org/extensions/xep-0189.html
-# STATUS:	Proposed
-# TYPE:		Standards Track
-# DATE:		2008-03-05
-
-# urn:xmpp:tmp:pubkey
-pubkeys
-fprint
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0191
-# NAME:		Simple Communications Blocking
-# URL:		http://www.xmpp.org/extensions/xep-0191.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-02-15
-
-# urn:xmpp:blocking
-block
-unblock
-blocklist
-item
-
-# urn:xmpp:blocking:errors
-blocked
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0192
-# NAME:		Proposed Stream Feature Improvements
-# URL:		http://www.xmpp.org/extensions/xep-0192.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-01-17
-
-# urn:ietf:params:xml:ns:xmpp-bind
-bind
-resource
-jid
-required
-
-# urn:ietf:params:xml:ns:xmpp-sasl
-mechanisms
-mechanism
-required
-auth
-challenge
-response
-abort
-success
-failure
-aborted
-incorrect-encoding
-invalid-authzid
-invalid-mechanism
-mechanism-too-weak
-not-authorized
-temporary-auth-failure
-
-# urn:xmpp:features:dialback
-dialback
-required
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0193
-# NAME:		Proposed Resource Binding Improvements
-# URL:		http://www.xmpp.org/extensions/xep-0193.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-01-17
-
-# urn:ietf:params:xml:ns:xmpp-bind
-bind
-resource
-jid
-required
-unbind
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0194
-# NAME:		User Chatting
-# URL:		http://www.xmpp.org/extensions/xep-0194.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-10-02
-
-# http://www.xmpp.org/extensions/xep-0194.html#ns
-room
-name
-topic
-uri
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0195
-# NAME:		User Browsing
-# URL:		http://www.xmpp.org/extensions/xep-0195.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-10-02
-
-# http://www.xmpp.org/extensions/xep-0195.html#ns
-page
-description
-keywords
-title
-uri
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0196
-# NAME:		User Gaming
-# URL:		http://www.xmpp.org/extensions/xep-0196.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-10-02
-
-# http://www.xmpp.org/extensions/xep-0196.html#ns
-game
-character_name
-character_profile
-level
-name
-server_address
-server_name
-uri
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0197
-# NAME:		User Viewing
-# URL:		http://www.xmpp.org/extensions/xep-0197.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-10-02
-
-# http://www.xmpp.org/extensions/xep-0197.html#ns
-room
-author
-cast
-channel_name
-description
-duration
-end_time
-episode
-program_name
-program_type
-start_time
-subprogram_type
-uri
-user_comment
-user_rating
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0198
-# NAME:		Stanza Acknowledgements
-# URL:		http://www.xmpp.org/extensions/xep-0198.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-10-03
-
-# http://www.xmpp.org/extensions/xep-0198.html#ns
-ack
-enable
-enabled
-r
-a
-ping
-pong
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0199
 # NAME:		XMPP Ping
-# URL:		http://www.xmpp.org/extensions/xep-0199.html
-# STATUS:	Draft
+# URL:		http://xmpp.org/extensions/xep-0199.html
+# STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2007-06-12
+# DATE:		2009-06-03
 
 # urn:xmpp:ping
 ping
@@ -1741,10 +504,10 @@ ping
 # --------------------------------------------------------------------
 # XEP:		XEP-0202
 # NAME:		Entity Time
-# URL:		http://www.xmpp.org/extensions/xep-0202.html
-# STATUS:	Draft
+# URL:		http://xmpp.org/extensions/xep-0202.html
+# STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2007-03-28
+# DATE:		2009-09-11
 
 # urn:xmpp:time
 time
@@ -1754,219 +517,93 @@ utc
 # --------------------------------------------------------------------
 # XEP:		XEP-0203
 # NAME:		Delayed Delivery
-# URL:		http://www.xmpp.org/extensions/xep-0203.html
-# STATUS:	Draft
+# URL:		http://xmpp.org/extensions/xep-0203.html
+# STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2007-03-29
+# DATE:		2009-09-15
 
 # urn:xmpp:delay
 delay
 
 # --------------------------------------------------------------------
-# XEP:		XEP-0206
-# NAME:		XMPP Over BOSH
-# URL:		http://www.xmpp.org/extensions/xep-0206.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-06-04
-
-# urn:xmpp:xbosh
-body
-uri
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0208
-# NAME:		Bootstrapping Implementation of Jingle
-# URL:		http://www.xmpp.org/extensions/xep-0208.html
-# STATUS:	Experimental
-# TYPE:		Informational
-# DATE:		2008-01-23
-
-# http://www.xmpp.org/extensions/xep-0208.html#ns
-description
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0209
-# NAME:		Metacontacts
-# URL:		http://www.xmpp.org/extensions/xep-0209.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-04-10
-
-# storage:metacontacts
-metacontacts
-meta
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0215
-# NAME:		External Service Discovery
-# URL:		http://www.xmpp.org/extensions/xep-0215.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-08-30
-
-# http://www.xmpp.org/extensions/xep-0215.html#ns
-services
-service
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0220
-# NAME:		Server Dialback
-# URL:		http://www.xmpp.org/extensions/xep-0220.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-06-18
-
-# jabber:server:dialback
-result
-verify
-
-# urn:xmpp:features:dialback
-dialback
-optional
-required
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0221
-# NAME:		Data Forms Media Element
-# URL:		http://www.xmpp.org/extensions/xep-0221.html
+# XEP:		XEP-0301
+# NAME:		In-Band Real Time Text
+# URL:		http://xmpp.org/extensions/xep-0301.html
 # STATUS:	Proposed
 # TYPE:		Standards Track
-# DATE:		2008-06-18
-
-# urn:xmpp:tmp:media-element
-media
-uri
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0224
-# NAME:		Attention
-# URL:		http://www.xmpp.org/extensions/xep-0224.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-08-08
-
-# http://www.xmpp.org/extensions/xep-0224.html#ns
-attention
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0225
-# NAME:		Component Connections
-# URL:		http://www.xmpp.org/extensions/xep-0225.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-08-08
-
-# urn:xmpp:tmp:component
-bind
-hostname
-required
-unbind
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0227
-# NAME:		Portable Import/Export Format for XMPP-IM Servers
-# URL:		http://www.xmpp.org/extensions/xep-0227.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-12-13
-
-# http://www.xmpp.org/extensions/xep-0227.html#ns
-server-data
-host
-user
-offline-messages
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0231
-# NAME:		Data Element
-# URL:		http://www.xmpp.org/extensions/xep-0231.html
-# STATUS:	Proposed
-# TYPE:		Standards Track
-# DATE:		2008-06-18
-
-# urn:xmpp:tmp:data-element
-data
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0233
-# NAME:		Use of Domain-Based Service Names in XMPP SASL Negotiation
-# URL:		http://www.xmpp.org/extensions/xep-0233.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-01-30
-
-# urn:xmpp:tmp:domain-based-name
-hostname
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0234
-# NAME:		Jingle File Transfer
-# URL:		http://www.xmpp.org/extensions/xep-0234.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-06-05
-
-# urn:xmpp:tmp:jingle:apps:file-transfer
-description
-offer
-request
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0235
-# NAME:		Authorization Tokens
-# URL:		http://www.xmpp.org/extensions/xep-0235.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-03-31
-
-# urn:xmpp:tmp:auth-token
-token
-token-required
+# DATE:		2013-09-25
+
+# urn:xmpp:rtt:0
+rtt
+t
+e
+w
+
+# --------------------------------------------------------------------
+# XEP:		TBD1
+# NAME:		OCCI Schema
+# URL:		http://redmine.ogf.org/projects/occi-wg/repository/revisions/xml-data-format/raw/schemas/occi.xsd
+
+# http://schemas.ogf.org/occi
+extension
+categories
+mixin
+kind
+action
+attribute
+parent
+depends
+applies
+summary
+link
+value
+filter
 
 # --------------------------------------------------------------------
-# XEP:		XEP-0237
-# NAME:		Roster Sequencing
-# URL:		http://www.xmpp.org/extensions/xep-0237.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-04-21
+# XEP:		TBD2
+# NAME:		XMLSchema schema
+# URL:		http://www.w3.org/2001/XMLSchema.xsd
 
-# jabber:iq:roster
-query
-item
+# http://www.w3.org/2001/XMLSchema
+schema
 group
-
-# urn:xmpp:tmp:roster-sequencing
-roster-sequencing
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0244
-# NAME:		IO Data
-# URL:		http://www.xmpp.org/extensions/xep-0244.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-06-18
-
-# urn:xmpp:tmp:io-data
-iodata
-desc
-in
-out
-error
-status
-elapsed
-remaining
-percentage
-information
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0247
-# NAME:		Jingle XML Streams
-# URL:		http://www.xmpp.org/extensions/xep-0247.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-06-18
-
-# urn:xmpp:tmp:jingle:apps:xmlstream
-description
+element
+simpleType
+attribute
+attributeGroup
+anyAttribute
+complexContent
+restriction
+extension
+simpleContent
+complexType
+all
+choice
+sequence
+any
+include
+redefine
+import
+selector
+field
+unique
+key
+keyref
+notation
+appinfo
+documentation
+annotation
+list
+union
+minExclusive
+minInclusive
+maxExclusive
+maxInclusive
+totalDigits
+fractionDigits
+length
+minLength
+maxLength
+enumeration
+whiteSpace
+pattern
diff --git a/include/internal/exmpp_known_nss.hrl.es b/include/internal/exmpp_known_nss.hrl.es
new file mode 100755
index 0000000..2e2e17f
--- /dev/null
+++ b/include/internal/exmpp_known_nss.hrl.es
@@ -0,0 +1,28 @@
+#!/usr/bin/env escript
+%% -*- erlang -*-
+
+main([ Known_NSS_Src ]) ->
+    io:format("% Generated by ~p~n", [filename:basename(escript:script_name())]),
+    Namespaces = lists:usort(read_nss(Known_NSS_Src)),
+    io:format("-define(XMPP_KNOWN_NSS,~n"
+              "        ~p).~n~n",
+              [ [ binary_to_atom(NS, utf8)
+                  || NS <- Namespaces ] ]),
+    timer:sleep(10).
+
+read_nss(Known_NSS_Src) ->
+    {ok, File} = file:open(Known_NSS_Src, [read, binary]),
+    read_nss(File, io:get_line(File, ""), []).
+
+read_nss(File, eof, Acc) ->
+    file:close(File),
+    lists:reverse(Acc);
+read_nss(File, << $#, _/binary >>, Acc) ->
+    read_nss(File, io:get_line(File, ""), Acc);
+read_nss(File, << $\n >>, Acc) ->
+    read_nss(File, io:get_line(File, ""), Acc);
+read_nss(File, NS_bin, Acc) when is_binary(NS_bin) ->
+    Len = byte_size(NS_bin) - 1,
+    << NS:Len/binary, _/binary >> = NS_bin,
+    read_nss(File, io:get_line(File, ""),
+             [NS | Acc]).
diff --git a/include/internal/exmpp_known_nss.in b/include/internal/exmpp_known_nss.in
index 504a670..b5f0817 100644
--- a/include/internal/exmpp_known_nss.in
+++ b/include/internal/exmpp_known_nss.in
@@ -1,4 +1,4 @@
-# Generated by extract-known-from-specs r560 on 2008-08-01T09:50:15Z
+# Generated by extract-known-from-specs r0 on 2013-10-08T15:22:55Z
 # vim:ft=conf:
 
 # --------------------------------------------------------------------
@@ -32,20 +32,10 @@ urn:ietf:params:xml:ns:xmpp-session
 
 urn:ietf:params:xml:ns:xmpp-e2e
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0003
-# NAME:		Proxy Accept Socket Service (PASS)
-# URL:		http://www.xmpp.org/extensions/xep-0003.html
-# STATUS:	Deprecated
-# TYPE:		Historical
-# DATE:		2007-01-17
-
-jabber:iq:pass
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0004
 # NAME:		Data Forms
-# URL:		http://www.xmpp.org/extensions/xep-0004.html
+# URL:		http://xmpp.org/extensions/xep-0004.html
 # STATUS:	Final
 # TYPE:		Standards Track
 # DATE:		2007-08-13
@@ -55,87 +45,27 @@ jabber:x:data
 # --------------------------------------------------------------------
 # XEP:		XEP-0009
 # NAME:		Jabber-RPC
-# URL:		http://www.xmpp.org/extensions/xep-0009.html
+# URL:		http://xmpp.org/extensions/xep-0009.html
 # STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2006-02-09
+# DATE:		2011-11-10
 
 jabber:iq:rpc
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0011
-# NAME:		Jabber Browsing
-# URL:		http://www.xmpp.org/extensions/xep-0011.html
-# STATUS:	Deprecated
-# TYPE:		Historical
-# DATE:		2004-11-12
-
-jabber:iq:browse
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0012
 # NAME:		Last Activity
-# URL:		http://www.xmpp.org/extensions/xep-0012.html
-# STATUS:	Draft
+# URL:		http://xmpp.org/extensions/xep-0012.html
+# STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2008-07-16
+# DATE:		2008-11-26
 
 jabber:iq:last
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0013
-# NAME:		Flexible Offline Message Retrieval
-# URL:		http://www.xmpp.org/extensions/xep-0013.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2005-07-14
-
-http://jabber.org/protocol/offline
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0016
-# NAME:		Privacy Lists
-# URL:		http://www.xmpp.org/extensions/xep-0016.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-02-15
-
-jabber:iq:privacy
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0020
-# NAME:		Feature Negotiation
-# URL:		http://www.xmpp.org/extensions/xep-0020.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2006-11-21
-
-http://jabber.org/protocol/feature-neg
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0022
-# NAME:		Message Events
-# URL:		http://www.xmpp.org/extensions/xep-0022.html
-# STATUS:	Deprecated
-# TYPE:		Historical
-# DATE:		2007-09-26
-
-jabber:x:event
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0023
-# NAME:		Message Expiration
-# URL:		http://www.xmpp.org/extensions/xep-0023.html
-# STATUS:	Deprecated
-# TYPE:		Historical
-# DATE:		2004-10-18
-
-jabber:x:expire
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0027
 # NAME:		Current Jabber OpenPGP Usage
-# URL:		http://www.xmpp.org/extensions/xep-0027.html
+# URL:		http://xmpp.org/extensions/xep-0027.html
 # STATUS:	Active
 # TYPE:		Historical
 # DATE:		2006-11-29
@@ -146,7 +76,7 @@ jabber:x:signed
 # --------------------------------------------------------------------
 # XEP:		XEP-0030
 # NAME:		Service Discovery
-# URL:		http://www.xmpp.org/extensions/xep-0030.html
+# URL:		http://xmpp.org/extensions/xep-0030.html
 # STATUS:	Final
 # TYPE:		Standards Track
 # DATE:		2008-06-06
@@ -154,74 +84,30 @@ jabber:x:signed
 http://jabber.org/protocol/disco#info
 http://jabber.org/protocol/disco#items
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0033
-# NAME:		Extended Stanza Addressing
-# URL:		http://www.xmpp.org/extensions/xep-0033.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2004-09-16
-
-http://jabber.org/protocol/address
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0045
-# NAME:		Multi-User Chat
-# URL:		http://www.xmpp.org/extensions/xep-0045.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2008-07-16
-
-http://jabber.org/protocol/muc
-http://jabber.org/protocol/muc#admin
-http://jabber.org/protocol/muc#owner
-http://jabber.org/protocol/muc#unique
-http://jabber.org/protocol/muc#user
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0047
-# NAME:		In-Band Bytestreams (IBB)
-# URL:		http://www.xmpp.org/extensions/xep-0047.html
-# STATUS:	Draft
+# NAME:		In-Band Bytestreams
+# URL:		http://xmpp.org/extensions/xep-0047.html
+# STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2006-11-29
+# DATE:		2012-06-22
 
 http://jabber.org/protocol/ibb
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0048
-# NAME:		Bookmarks
-# URL:		http://www.xmpp.org/extensions/xep-0048.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-11-07
-
-storage:bookmarks
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0049
 # NAME:		Private XML Storage
-# URL:		http://www.xmpp.org/extensions/xep-0049.html
+# URL:		http://xmpp.org/extensions/xep-0049.html
 # STATUS:	Active
 # TYPE:		Historical
 # DATE:		2004-03-01
 
 jabber:iq:private
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0050
-# NAME:		Ad-Hoc Commands
-# URL:		http://www.xmpp.org/extensions/xep-0050.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2005-06-30
-
-http://jabber.org/protocol/commands
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0054
 # NAME:		vcard-temp
-# URL:		http://www.xmpp.org/extensions/xep-0054.html
+# URL:		http://xmpp.org/extensions/xep-0054.html
 # STATUS:	Active
 # TYPE:		Historical
 # DATE:		2008-07-16
@@ -231,810 +117,176 @@ vcard-temp
 # --------------------------------------------------------------------
 # XEP:		XEP-0055
 # NAME:		Jabber Search
-# URL:		http://www.xmpp.org/extensions/xep-0055.html
+# URL:		http://xmpp.org/extensions/xep-0055.html
 # STATUS:	Active
 # TYPE:		Historical
-# DATE:		2004-03-22
+# DATE:		2009-09-15
 
 jabber:iq:search
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0059
-# NAME:		Result Set Management
-# URL:		http://www.xmpp.org/extensions/xep-0059.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2006-09-20
-
-http://jabber.org/protocol/rsm
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0060
-# NAME:		Publish-Subscribe
-# URL:		http://www.xmpp.org/extensions/xep-0060.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2008-03-05
-
-http://jabber.org/protocol/pubsub
-http://jabber.org/protocol/pubsub#errors
-http://jabber.org/protocol/pubsub#event
-http://jabber.org/protocol/pubsub#owner
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0065
-# NAME:		SOCKS5 Bytestreams
-# URL:		http://www.xmpp.org/extensions/xep-0065.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-05-21
-
-http://jabber.org/protocol/bytestreams
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0066
-# NAME:		Out of Band Data
-# URL:		http://www.xmpp.org/extensions/xep-0066.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2006-08-16
-
-jabber:iq:oob
-jabber:x:oob
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0070
-# NAME:		Verifying HTTP Requests via XMPP
-# URL:		http://www.xmpp.org/extensions/xep-0070.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2005-12-14
-
-http://jabber.org/protocol/http-auth
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0071
-# NAME:		XHTML-IM
-# URL:		http://www.xmpp.org/extensions/xep-0071.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-08-29
-
-http://jabber.org/protocol/xhtml-im
-http://www.w3.org/1999/xhtml
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0072
-# NAME:		SOAP Over XMPP
-# URL:		http://www.xmpp.org/extensions/xep-0072.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2005-12-14
-
-http://jabber.org/protocol/soap#fault
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0077
 # NAME:		In-Band Registration
-# URL:		http://www.xmpp.org/extensions/xep-0077.html
+# URL:		http://xmpp.org/extensions/xep-0077.html
 # STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2006-01-24
+# DATE:		2012-01-25
 
 http://jabber.org/features/iq-register
 jabber:iq:register
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0078
-# NAME:		Non-SASL Authentication
-# URL:		http://www.xmpp.org/extensions/xep-0078.html
-# STATUS:	Deprecated
-# TYPE:		Standards Track
-# DATE:		2008-01-30
-
-http://jabber.org/features/iq-auth
-jabber:iq:auth
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0079
-# NAME:		Advanced Message Processing
-# URL:		http://www.xmpp.org/extensions/xep-0079.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2005-11-30
-
-http://jabber.org/features/amp
-http://jabber.org/protocol/amp
-http://jabber.org/protocol/amp#errors
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0080
-# NAME:		User Location
-# URL:		http://www.xmpp.org/extensions/xep-0080.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2008-01-30
-
-http://jabber.org/protocol/geoloc
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0083
 # NAME:		Nested Roster Groups
-# URL:		http://www.xmpp.org/extensions/xep-0083.html
+# URL:		http://xmpp.org/extensions/xep-0083.html
 # STATUS:	Active
 # TYPE:		Informational
 # DATE:		2004-10-11
 
 roster:delimiter
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0084
-# NAME:		User Avatar
-# URL:		http://www.xmpp.org/extensions/xep-0084.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-11-07
-
-urn:xmpp:avatar:metadata
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0085
 # NAME:		Chat State Notifications
-# URL:		http://www.xmpp.org/extensions/xep-0085.html
-# STATUS:	Draft
+# URL:		http://xmpp.org/extensions/xep-0085.html
+# STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2006-07-12
+# DATE:		2009-09-23
 
 http://jabber.org/protocol/chatstates
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0090
-# NAME:		Entity Time
-# URL:		http://www.xmpp.org/extensions/xep-0090.html
-# STATUS:	Deprecated
-# TYPE:		Historical
-# DATE:		2007-03-28
-
-jabber:iq:time
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0091
-# NAME:		Delayed Delivery
-# URL:		http://www.xmpp.org/extensions/xep-0091.html
-# STATUS:	Deprecated
-# TYPE:		Historical
-# DATE:		2007-03-29
-
-jabber:x:delay
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0092
-# NAME:		Software Version
-# URL:		http://www.xmpp.org/extensions/xep-0092.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-02-16
-
-jabber:iq:version
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0093
 # NAME:		Roster Item Exchange
-# URL:		http://www.xmpp.org/extensions/xep-0093.html
+# URL:		http://xmpp.org/extensions/xep-0093.html
 # STATUS:	Deprecated
 # TYPE:		Historical
 # DATE:		2005-08-26
 
 jabber:x:roster
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0095
-# NAME:		Stream Initiation
-# URL:		http://www.xmpp.org/extensions/xep-0095.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2004-04-13
-
-http://jabber.org/protocol/si
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0096
-# NAME:		File Transfer
-# URL:		http://www.xmpp.org/extensions/xep-0096.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2004-04-13
-
-http://jabber.org/protocol/si/profile/file-transfer
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0100
 # NAME:		Gateway Interaction
-# URL:		http://www.xmpp.org/extensions/xep-0100.html
+# URL:		http://xmpp.org/extensions/xep-0100.html
 # STATUS:	Active
 # TYPE:		Informational
 # DATE:		2005-10-05
 
 jabber:iq:gateway
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0107
-# NAME:		User Mood
-# URL:		http://www.xmpp.org/extensions/xep-0107.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-06-04
-
-http://jabber.org/protocol/mood
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0108
-# NAME:		User Activity
-# URL:		http://www.xmpp.org/extensions/xep-0108.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-07-11
-
-http://jabber.org/protocol/activity
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0114
 # NAME:		Jabber Component Protocol
-# URL:		http://www.xmpp.org/extensions/xep-0114.html
+# URL:		http://xmpp.org/extensions/xep-0114.html
 # STATUS:	Active
 # TYPE:		Historical
-# DATE:		2005-03-03
+# DATE:		2012-01-25
 
 jabber:component:accept
 jabber:component:connect
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0115
-# NAME:		Entity Capabilities
-# URL:		http://www.xmpp.org/extensions/xep-0115.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2008-02-25
-
-http://jabber.org/protocol/caps
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0118
-# NAME:		User Tune
-# URL:		http://www.xmpp.org/extensions/xep-0118.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2008-01-30
-
-http://jabber.org/protocol/tune
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0122
-# NAME:		Data Forms Validation
-# URL:		http://www.xmpp.org/extensions/xep-0122.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2004-09-22
-
-http://jabber.org/protocol/xdata-validate
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0124
-# NAME:		Bidirectional-streams Over Synchronous HTTP (BOSH)
-# URL:		http://www.xmpp.org/extensions/xep-0124.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-02-28
-
-http://jabber.org/protocol/httpbind
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0130
 # NAME:		Waiting Lists
-# URL:		http://www.xmpp.org/extensions/xep-0130.html
-# STATUS:	Active
+# URL:		http://xmpp.org/extensions/xep-0130.html
+# STATUS:	Deprecated
 # TYPE:		Historical
-# DATE:		2006-09-13
+# DATE:		2012-04-18
 
 http://jabber.org/protocol/waitinglist
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0131
-# NAME:		Stanza Headers and Internet Metadata (SHIM)
-# URL:		http://www.xmpp.org/extensions/xep-0131.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2006-07-12
-
-http://jabber.org/protocol/shim
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0136
-# NAME:		Message Archiving
-# URL:		http://www.xmpp.org/extensions/xep-0136.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2008-07-16
-
-urn:xmpp:archive
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0137
-# NAME:		Publishing SI Requests
-# URL:		http://www.xmpp.org/extensions/xep-0137.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2005-08-26
-
-http://jabber.org/protocol/sipub
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0138
 # NAME:		Stream Compression
-# URL:		http://www.xmpp.org/extensions/xep-0138.html
-# STATUS:	Draft
+# URL:		http://xmpp.org/extensions/xep-0138.html
+# STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2007-09-26
+# DATE:		2009-05-27
 
 http://jabber.org/features/compress
 http://jabber.org/protocol/compress
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0141
-# NAME:		Data Forms Layout
-# URL:		http://www.xmpp.org/extensions/xep-0141.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2005-05-12
-
-http://jabber.org/protocol/xdata-layout
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0144
-# NAME:		Roster Item Exchange
-# URL:		http://www.xmpp.org/extensions/xep-0144.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2005-08-26
-
-http://jabber.org/protocol/rosterx
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0145
 # NAME:		Annotations
-# URL:		http://www.xmpp.org/extensions/xep-0145.html
+# URL:		http://xmpp.org/extensions/xep-0145.html
 # STATUS:	Active
 # TYPE:		Historical
 # DATE:		2006-03-23
 
 storage:rosternotes
 
+# --------------------------------------------------------------------
+# XEP:		XEP-0152
+# NAME:		Reachability Addresses
+# URL:		http://xmpp.org/extensions/xep-0152.html
+# STATUS:	Proposed
+# TYPE:		Standards Track
+# DATE:		2013-09-25
+
+urn:xmpp:reach:0
+
 # --------------------------------------------------------------------
 # XEP:		XEP-0153
 # NAME:		vCard-Based Avatars
-# URL:		http://www.xmpp.org/extensions/xep-0153.html
+# URL:		http://xmpp.org/extensions/xep-0153.html
 # STATUS:	Active
 # TYPE:		Historical
 # DATE:		2006-08-16
 
 vcard-temp:x:update
 
-# --------------------------------------------------------------------
-# XEP:		XEP-0154
-# NAME:		User Profile
-# URL:		http://www.xmpp.org/extensions/xep-0154.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-04-18
-
-urn:xmpp:tmp:profile
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0158
-# NAME:		Robot Challenges
-# URL:		http://www.xmpp.org/extensions/xep-0158.html
-# STATUS:	Proposed
-# TYPE:		Standards Track
-# DATE:		2008-05-12
-
-urn:xmpp:tmp:challenge
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0161
-# NAME:		Abuse Reporting
-# URL:		http://www.xmpp.org/extensions/xep-0161.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-05-06
-
-urn:xmpp:tmp:abuse
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0166
-# NAME:		Jingle
-# URL:		http://www.xmpp.org/extensions/xep-0166.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-07-31
-
-urn:xmpp:tmp:jingle
-urn:xmpp:tmp:jingle:errors
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0167
-# NAME:		Jingle RTP Sessions
-# URL:		http://www.xmpp.org/extensions/xep-0167.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-07-31
-
-urn:xmpp:tmp:jingle:apps:rtp
-urn:xmpp:tmp:jingle:apps:rtp:info
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0168
-# NAME:		Resource Application Priority
-# URL:		http://www.xmpp.org/extensions/xep-0168.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-01-23
-
-http://www.xmpp.org/extensions/xep-0168.html#ns
-http://www.xmpp.org/extensions/xep-0168.html#ns-route
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0171
-# NAME:		Language Translation
-# URL:		http://www.xmpp.org/extensions/xep-0171.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2008-05-09
-
-urn:xmpp:langtrans
-urn:xmpp:langtrans#items
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0172
-# NAME:		User Nickname
-# URL:		http://www.xmpp.org/extensions/xep-0172.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2006-06-05
-
-http://jabber.org/protocol/nick
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0176
-# NAME:		Jingle ICE-UDP Transport Method
-# URL:		http://www.xmpp.org/extensions/xep-0176.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-07-31
-
-urn:xmpp:tmp:jingle:transports:ice-udp
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0177
-# NAME:		Jingle Raw UDP Transport Method
-# URL:		http://www.xmpp.org/extensions/xep-0177.html
-# STATUS:	Proposed
-# TYPE:		Standards Track
-# DATE:		2007-11-27
-
-urn:xmpp:tmp:jingle:transports:raw-udp
-urn:xmpp:tmp:jingle:transports:raw-udp:info
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0181
-# NAME:		Jingle DTMF
-# URL:		http://www.xmpp.org/extensions/xep-0181.html
-# STATUS:	Proposed
-# TYPE:		Standards Track
-# DATE:		2008-05-30
-
-urn:xmpp:tmp:jingle:dtmf
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0184
-# NAME:		Message Receipts
-# URL:		http://www.xmpp.org/extensions/xep-0184.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-09-26
-
-urn:xmpp:receipts
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0186
-# NAME:		Invisible Command
-# URL:		http://www.xmpp.org/extensions/xep-0186.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-05-12
-
-urn:xmpp:tmp:invisible
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0189
-# NAME:		Public Key Publishing
-# URL:		http://www.xmpp.org/extensions/xep-0189.html
-# STATUS:	Proposed
-# TYPE:		Standards Track
-# DATE:		2008-03-05
-
-urn:xmpp:tmp:pubkey
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0191
-# NAME:		Simple Communications Blocking
-# URL:		http://www.xmpp.org/extensions/xep-0191.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-02-15
-
-urn:xmpp:blocking
-urn:xmpp:blocking:errors
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0192
-# NAME:		Proposed Stream Feature Improvements
-# URL:		http://www.xmpp.org/extensions/xep-0192.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-01-17
-
-urn:ietf:params:xml:ns:xmpp-bind
-urn:ietf:params:xml:ns:xmpp-sasl
-urn:xmpp:features:dialback
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0193
-# NAME:		Proposed Resource Binding Improvements
-# URL:		http://www.xmpp.org/extensions/xep-0193.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-01-17
-
-urn:ietf:params:xml:ns:xmpp-bind
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0194
-# NAME:		User Chatting
-# URL:		http://www.xmpp.org/extensions/xep-0194.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-10-02
-
-http://www.xmpp.org/extensions/xep-0194.html#ns
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0195
-# NAME:		User Browsing
-# URL:		http://www.xmpp.org/extensions/xep-0195.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-10-02
-
-http://www.xmpp.org/extensions/xep-0195.html#ns
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0196
-# NAME:		User Gaming
-# URL:		http://www.xmpp.org/extensions/xep-0196.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-10-02
-
-http://www.xmpp.org/extensions/xep-0196.html#ns
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0197
-# NAME:		User Viewing
-# URL:		http://www.xmpp.org/extensions/xep-0197.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-10-02
-
-http://www.xmpp.org/extensions/xep-0197.html#ns
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0198
-# NAME:		Stanza Acknowledgements
-# URL:		http://www.xmpp.org/extensions/xep-0198.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-10-03
-
-http://www.xmpp.org/extensions/xep-0198.html#ns
-
 # --------------------------------------------------------------------
 # XEP:		XEP-0199
 # NAME:		XMPP Ping
-# URL:		http://www.xmpp.org/extensions/xep-0199.html
-# STATUS:	Draft
+# URL:		http://xmpp.org/extensions/xep-0199.html
+# STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2007-06-12
+# DATE:		2009-06-03
 
 urn:xmpp:ping
 
 # --------------------------------------------------------------------
 # XEP:		XEP-0202
 # NAME:		Entity Time
-# URL:		http://www.xmpp.org/extensions/xep-0202.html
-# STATUS:	Draft
+# URL:		http://xmpp.org/extensions/xep-0202.html
+# STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2007-03-28
+# DATE:		2009-09-11
 
 urn:xmpp:time
 
 # --------------------------------------------------------------------
 # XEP:		XEP-0203
 # NAME:		Delayed Delivery
-# URL:		http://www.xmpp.org/extensions/xep-0203.html
-# STATUS:	Draft
+# URL:		http://xmpp.org/extensions/xep-0203.html
+# STATUS:	Final
 # TYPE:		Standards Track
-# DATE:		2007-03-29
+# DATE:		2009-09-15
 
 urn:xmpp:delay
 
 # --------------------------------------------------------------------
-# XEP:		XEP-0206
-# NAME:		XMPP Over BOSH
-# URL:		http://www.xmpp.org/extensions/xep-0206.html
-# STATUS:	Draft
-# TYPE:		Standards Track
-# DATE:		2007-06-04
-
-urn:xmpp:xbosh
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0208
-# NAME:		Bootstrapping Implementation of Jingle
-# URL:		http://www.xmpp.org/extensions/xep-0208.html
-# STATUS:	Experimental
-# TYPE:		Informational
-# DATE:		2008-01-23
-
-http://www.xmpp.org/extensions/xep-0208.html#ns
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0209
-# NAME:		Metacontacts
-# URL:		http://www.xmpp.org/extensions/xep-0209.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-04-10
-
-storage:metacontacts
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0215
-# NAME:		External Service Discovery
-# URL:		http://www.xmpp.org/extensions/xep-0215.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-08-30
-
-http://www.xmpp.org/extensions/xep-0215.html#ns
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0220
-# NAME:		Server Dialback
-# URL:		http://www.xmpp.org/extensions/xep-0220.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-06-18
-
-jabber:server:dialback
-urn:xmpp:features:dialback
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0221
-# NAME:		Data Forms Media Element
-# URL:		http://www.xmpp.org/extensions/xep-0221.html
-# STATUS:	Proposed
-# TYPE:		Standards Track
-# DATE:		2008-06-18
-
-urn:xmpp:tmp:media-element
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0224
-# NAME:		Attention
-# URL:		http://www.xmpp.org/extensions/xep-0224.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-08-08
-
-http://www.xmpp.org/extensions/xep-0224.html#ns
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0225
-# NAME:		Component Connections
-# URL:		http://www.xmpp.org/extensions/xep-0225.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-08-08
-
-urn:xmpp:tmp:component
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0227
-# NAME:		Portable Import/Export Format for XMPP-IM Servers
-# URL:		http://www.xmpp.org/extensions/xep-0227.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2007-12-13
-
-http://www.xmpp.org/extensions/xep-0227.html#ns
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0231
-# NAME:		Data Element
-# URL:		http://www.xmpp.org/extensions/xep-0231.html
+# XEP:		XEP-0301
+# NAME:		In-Band Real Time Text
+# URL:		http://xmpp.org/extensions/xep-0301.html
 # STATUS:	Proposed
 # TYPE:		Standards Track
-# DATE:		2008-06-18
-
-urn:xmpp:tmp:data-element
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0233
-# NAME:		Use of Domain-Based Service Names in XMPP SASL Negotiation
-# URL:		http://www.xmpp.org/extensions/xep-0233.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-01-30
+# DATE:		2013-09-25
 
-urn:xmpp:tmp:domain-based-name
+urn:xmpp:rtt:0
 
 # --------------------------------------------------------------------
-# XEP:		XEP-0234
-# NAME:		Jingle File Transfer
-# URL:		http://www.xmpp.org/extensions/xep-0234.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-06-05
-
-urn:xmpp:tmp:jingle:apps:file-transfer
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0235
-# NAME:		Authorization Tokens
-# URL:		http://www.xmpp.org/extensions/xep-0235.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-03-31
+# XEP:		TBD1
+# NAME:		OCCI Schema
+# URL:		http://redmine.ogf.org/projects/occi-wg/repository/revisions/xml-data-format/raw/schemas/occi.xsd
 
-urn:xmpp:tmp:auth-token
+http://schemas.ogf.org/occi
 
 # --------------------------------------------------------------------
-# XEP:		XEP-0237
-# NAME:		Roster Sequencing
-# URL:		http://www.xmpp.org/extensions/xep-0237.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-04-21
-
-jabber:iq:roster
-urn:xmpp:tmp:roster-sequencing
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0244
-# NAME:		IO Data
-# URL:		http://www.xmpp.org/extensions/xep-0244.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-06-18
-
-urn:xmpp:tmp:io-data
-
-# --------------------------------------------------------------------
-# XEP:		XEP-0247
-# NAME:		Jingle XML Streams
-# URL:		http://www.xmpp.org/extensions/xep-0247.html
-# STATUS:	Experimental
-# TYPE:		Standards Track
-# DATE:		2008-06-18
+# XEP:		TBD2
+# NAME:		XMLSchema schema
+# URL:		http://www.w3.org/2001/XMLSchema.xsd
 
-urn:xmpp:tmp:jingle:apps:xmlstream
+http://www.w3.org/2001/XMLSchema
diff --git a/include/internal/extract-known-from-specs b/include/internal/extract-known-from-specs
index 398303f..aaf1f99 100755
--- a/include/internal/extract-known-from-specs
+++ b/include/internal/extract-known-from-specs
@@ -69,6 +69,7 @@ EOF
 		print "$id: $name\n";
 
 		# Fetch page.
+		print "  Fetching schema: $url\n";
 		my $content = get($url);
 		unless (defined $content) {
 			print STDERR "  Can't retrieve URL '$url'\n";
diff --git a/include/internal/make-specs-list b/include/internal/make-specs-list
index b85531b..ec60ee2 100755
--- a/include/internal/make-specs-list
+++ b/include/internal/make-specs-list
@@ -8,11 +8,11 @@ use LWP::Simple;
 use File::Basename;
 use POSIX qw(strftime);
 
-our $SPECS_URL = 'http://www.xmpp.org/extensions/all.shtml';
+our $SPECS_URL = 'http://xmpp.org/xmpp-protocols/xmpp-extensions/';
 
 # OR'd regex.
 our $TYPE_EXCL1 = qr/(Humorous|JIG Formation|Procedural)/io;
-our $STATUS_EXCL1 = qr/(Deferred|Obsolete|Rejected|Retracted)/io;
+our $STATUS_EXCL1 = qr/(Deferred|Obsolete|Rejected|Retracted|Draft|Experimental)/io;
 
 # AND'd regex.
 our $TYPE_EXCL2 = qr/(Informational)/io;
@@ -52,26 +52,27 @@ sub main {
 	my $xep;
 
 	# Walk through the lines of $content.
+	$content =~ s/(<[^\/])/\r\n$1/g;
 	foreach $line (split /[\r\n]+/, $content) {
-		if ($line =~ /^<tr class='tablebody'>/o) {
+		if ($line =~ /^<tr class="tablebody/o) {
 			# XEP entry start.
 			push @xeps, $xep if %$xep;
 			$xep = {};
 		} elsif (!exists $xep->{'id'} &&
-		    $line =~ /^<td valign='top'><a href='([^']+)'>([^<]+)/o) {
-			# ID and URL.
-			$xep->{'id'} = $2;
-			$xep->{'url'} = $1;
-		} elsif ($line =~ /^<td valign='top'>([^<]+)/o) {
-			if (!exists $xep->{'name'}) {
-				$xep->{'name'} = $1;
-			} elsif (!exists $xep->{'type'}) {
-				$xep->{'type'} = $1;
-			} elsif (!exists $xep->{'status'}) {
-				$xep->{'status'} = $1;
-			} elsif (!exists $xep->{'date'}) {
-				$xep->{'date'} = $1;
-			}
+			 $line =~ /^<a href="([^"]+\.html)">(XEP-[^<]+)/o) {
+		    # ID and URL.
+		    $xep->{'id'} = $2;
+		    $xep->{'url'} = "http://xmpp.org" . $1;
+		} elsif ($line =~ /^<td valign="top">([^<]+)/o) {
+		    if (!exists $xep->{'name'}) {
+			$xep->{'name'} = $1;
+		    } elsif (!exists $xep->{'type'}) {
+			$xep->{'type'} = $1;
+		    } elsif (!exists $xep->{'status'}) {
+			$xep->{'status'} = $1;
+		    } elsif (!exists $xep->{'date'}) {
+			$xep->{'date'} = $1;
+		    }			    
 		}
 	}
 	push @xeps, $xep if %$xep;
diff --git a/include/internal/occi-schemas.in b/include/internal/occi-schemas.in
new file mode 100644
index 0000000..3b80be4
--- /dev/null
+++ b/include/internal/occi-schemas.in
@@ -0,0 +1,9 @@
+# --------------------------------------------------------------------
+XEP:		TBD1
+NAME:		OCCI Schema
+URL:		http://redmine.ogf.org/projects/occi-wg/repository/revisions/xml-data-format/raw/schemas/occi.xsd
+
+# --------------------------------------------------------------------
+XEP:		TBD2
+NAME:		XMLSchema schema
+URL:		http://www.w3.org/2001/XMLSchema.xsd
diff --git a/rebar.config b/rebar.config
new file mode 100644
index 0000000..ba3f5a8
--- /dev/null
+++ b/rebar.config
@@ -0,0 +1,60 @@
+% -*- mode: erlang -*-
+{erl_opts, [debug_info,
+	    {d, 'HAVE_EXPAT', true},
+	    {d, 'HAVE_LIBXML2', true}
+	   ]}.
+
+{require_otp_vsn, "R12B-5|R1[3456].*"}.
+
+{clean_files, ["src/exmpp_known_attrs.erl",
+	       "src/exmpp_known_elems.erl",
+	       "src/exmpp_known_nss.erl",
+	       "include/internal/exmpp_known_attrs.hrl",
+	       "include/internal/exmpp_known_elems.hrl",
+	       "include/internal/exmpp_known_nss.hrl"]}.
+
+{pre_hooks, [
+	     {compile, "make -C include/internal/"},
+	     {compile, "make -C src/"}
+	    ]}.
+
+{port_specs, [
+	      % Stringprep port driver
+	      {"linux", "priv/lib/exmpp_stringprep.so",
+	       ["c_src/exmpp_driver.c", "c_src/stringprep_uni_data.c", 
+		"c_src/stringprep_uni_norm.c", "c_src/exmpp_stringprep.c"],
+	       [{env, 
+		 [{"LDFLAGS", "$LDFLAGS $ERL_LDFLAGS"}]}
+	       ]},
+	      % Expat port driver
+	      {"linux", "priv/lib/exmpp_xml_expat.so",
+	       ["c_src/exmpp_driver.c", "c_src/exmpp_xml.c", "c_src/exmpp_xml_expat.c"],
+	       [{env, 
+		 [{"LDFLAGS", "$LDFLAGS -lexpat"}]}
+	       ]},
+	      {"linux", "priv/lib/exmpp_xml_expat_legacy.so",
+	       ["c_src/exmpp_driver.c", "c_src/exmpp_xml.c", 
+		"c_src/exmpp_xml_expat_legacy.c"],
+	       [{env, 
+		 [{"LDFLAGS", "$LDFLAGS -lexpat"}]}
+	       ]},
+	      % LibXML2 port drivers
+	      {"linux", "priv/lib/exmpp_xml_libxml2.so",
+	       ["c_src/exmpp_driver.c", "c_src/exmpp_xml.c", "c_src/exmpp_xml_libxml2.c"],
+	       [{env,
+		 [{"CFLAGS", "$CFLAGS -I/usr/include/libxml2"}, 
+		  {"LDFLAGS", "$LDFLAGS -lxml2"}]}
+	       ]},
+	      % OpenSSL TLS port driver
+	      {"linux", "priv/lib/exmpp_tls_openssl.so",
+	       ["c_src/exmpp_driver.c", "c_src/exmpp_tls.c", "c_src/exmpp_tls_openssl.c"],
+	       [{env,
+		 [{"LDFLAGS", "$LDFLAGS -lssl"}]}
+	       ]},
+	      % Zlib compression port driver
+	      {"linux", "priv/lib/exmpp_compress_zlib.so",
+	       ["c_src/exmpp_driver.c", "c_src/exmpp_compress_zlib.c"],
+	       [{env,
+		 [{"LDFLAGS", "$LDFLAGS -lz"}]}
+	       ]}
+	     ]}.
diff --git a/src/Makefile b/src/Makefile
new file mode 100644
index 0000000..35985a4
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,30 @@
+top_srcdir=..
+srcdir=.
+
+KNOWN_NSS_SOURCE = $(top_srcdir)/include/internal/exmpp_known_nss.in
+KNOWN_ELEMS_SOURCE = $(top_srcdir)/include/internal/exmpp_known_elems.in
+KNOWN_ATTRS_SOURCE = $(top_srcdir)/include/internal/exmpp_known_attrs.in
+
+BUILT_SOURCES = exmpp_known_nss.erl					\
+		exmpp_known_elems.erl					\
+		exmpp_known_attrs.erl
+
+CLEANFILES = $(BUILT_SOURCES)
+
+all: $(BUILT_SOURCES)
+
+clean:
+	rm -r $(CLEANFILES)
+
+# --------------------------------------------------------------------
+# Known namespaces/names/attributes headers generation.
+# --------------------------------------------------------------------
+
+exmpp_known_nss.erl: $(srcdir)/exmpp_known_nss.erl.es $(KNOWN_NSS_SOURCE)
+	$(srcdir)/exmpp_known_nss.erl.es $(KNOWN_NSS_SOURCE) > $@
+
+exmpp_known_elems.erl: $(srcdir)/exmpp_known_elems.erl.es $(KNOWN_ELEMS_SOURCE)
+	$(srcdir)/exmpp_known_elems.erl.es $(KNOWN_ELEMS_SOURCE) > $@
+
+exmpp_known_attrs.erl: $(srcdir)/exmpp_known_attrs.erl.es $(KNOWN_ATTRS_SOURCE)
+	$(srcdir)/exmpp_known_attrs.erl.es $(KNOWN_ATTRS_SOURCE) > $@
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 6c02172..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-EXTRA_DIST = core/exmpp.erl						\
-	     core/exmpp_sup.erl						\
-	     core/exmpp_internals.erl					\
-	     core/exmpp_utils.erl					\
-	     core/exmpp_xml.erl						\
-	     core/exmpp_xmlstream.erl					\
-	     core/exmpp_stringprep.erl					\
-	     core/exmpp_caps.erl						\
-	     core/exmpp_jid.erl						\
-	     core/exmpp_stanza.erl					\
-	     core/exmpp_stream.erl					\
-	     core/exmpp_dialback.erl					\
-	     core/exmpp_iq.erl						\
-	     core/exmpp_message.erl					\
-	     core/exmpp_presence.erl					\
-	     core/exmpp_tls.erl						\
-	     core/exmpp_compress.erl					\
-	     core/exmpp_known_nss.erl.awk				\
-	     core/exmpp_known_nss.erl.js				\
-	     core/exmpp_known_elems.erl.awk				\
-	     core/exmpp_known_elems.erl.js				\
-	     core/exmpp_known_attrs.erl.awk				\
-	     core/exmpp_known_attrs.erl.js				\
-	     network/exmpp_session.erl					\
-	     network/exmpp_socket.erl					\
-	     network/exmpp_bosh.erl					\
-	     network/exmpp_component.erl				\
-	     network/exmpp_dns.erl					\
-	     network/exmpp_sasl_digest.erl					\
-	     client/exmpp_client_binding.erl				\
-	     client/exmpp_client_compression.erl			\
-	     client/exmpp_client_disco.erl			\
-	     client/exmpp_client_legacy_auth.erl			\
-	     client/exmpp_client_privacy.erl				\
-	     client/exmpp_client_pubsub.erl				\
-	     client/exmpp_client_register.erl				\
-	     client/exmpp_client_roster.erl				\
-	     client/exmpp_client_sasl.erl				\
-	     client/exmpp_client_session.erl				\
-	     client/exmpp_client_tls.erl				\
-	     client/exmpp_client_muc.erl				\
-	     server/exmpp_server_binding.erl				\
-	     server/exmpp_server_compression.erl			\
-	     server/exmpp_server_legacy_auth.erl			\
-	     server/exmpp_server_privacy.erl				\
-	     server/exmpp_server_sasl.erl				\
-	     server/exmpp_server_session.erl				\
-	     server/exmpp_server_tls.erl				\
-	     compat/ejabberd_socket.erl					\
-	     compat/stringprep.erl					\
-	     compat/tls.erl						\
-	     compat/xml.erl						\
-	     compat/xml_stream.erl
-
-KNOWN_NSS_SOURCE = $(top_srcdir)/include/internal/exmpp_known_nss.in
-KNOWN_ELEMS_SOURCE = $(top_srcdir)/include/internal/exmpp_known_elems.in
-KNOWN_ATTRS_SOURCE = $(top_srcdir)/include/internal/exmpp_known_attrs.in
-
-BUILT_SOURCES = exmpp_known_nss.erl					\
-		exmpp_known_elems.erl					\
-		exmpp_known_attrs.erl
-
-CLEANFILES = $(BUILT_SOURCES)
-
-# --------------------------------------------------------------------
-# Known namespaces/names/attributes headers generation.
-# --------------------------------------------------------------------
-
-exmpp_known_nss.erl: $(srcdir)/core/exmpp_known_nss.erl.awk $(KNOWN_NSS_SOURCE)
-	$(AWK) -f $(srcdir)/core/exmpp_known_nss.erl.awk $(KNOWN_NSS_SOURCE) > $@
-
-exmpp_known_elems.erl: $(srcdir)/core/exmpp_known_elems.erl.awk $(KNOWN_ELEMS_SOURCE)
-	$(AWK) -f $(srcdir)/core/exmpp_known_elems.erl.awk $(KNOWN_ELEMS_SOURCE) > $@
-
-exmpp_known_attrs.erl: $(srcdir)/core/exmpp_known_attrs.erl.awk $(KNOWN_ATTRS_SOURCE)
-	$(AWK) -f $(srcdir)/core/exmpp_known_attrs.erl.awk $(KNOWN_ATTRS_SOURCE) > $@
-
-all-local:
-	@$(ERL) +B -noshell -pa @top_builddir@/ebin			\
-		-eval "case make:all() of				\
-		         up_to_date -> halt(0);				\
-		         Err ->						\
-		           io:format(\"~p~n\", [Err]),			\
-		           halt(1)					\
-		       end"
diff --git a/src/Makefile.unix b/src/Makefile.unix
deleted file mode 100644
index 4c490ea..0000000
--- a/src/Makefile.unix
+++ /dev/null
@@ -1,32 +0,0 @@
-# Programs.
-ERL ?= erl
-RM  ?= rm -f
-SED ?= sed
-
-# Erlang compiler options.
-EMKOPTS_WARNINGS ?= report_warnings, {warn_format, 1}, warn_export_vars, warn_shadow_vars, warn_unused_import
-EMKOPTS_DEBUG ?= debug_info, {d, debug}
-
-ifdef EMKOPTS
-EMKOPTS += ", $(EMKOPTS_WARNINGS), $(EMKOPTS_DEBUG)"
-else
-EMKOPTS = "$(EMKOPTS_WARNINGS), $(EMKOPTS_DEBUG)"
-endif
-
-all:
-	@echo Generate: Emakefile; \
-	$(SED) \
-		-e 's|@srcdir@/||g' \
-		-e 's|@builddir@/||g' \
-		-e 's|@top_srcdir@|..|g' \
-		-e 's|@top_builddir@|..|g' \
-		-e 's|@COMPAT_MODULES_START@|,|' \
-		-e 's|@COMPAT_MODULES@||g' \
-		-e 's|@EMKOPTS@|$(EMKOPTS)|' \
-		Emakefile.in > Emakefile
-	$(ERL) -make
-
-clean:
-	$(RM) Emakefile
-
-.PHONY: clean
diff --git a/src/exmpp.app.src b/src/exmpp.app.src
new file mode 100644
index 0000000..cf019cd
--- /dev/null
+++ b/src/exmpp.app.src
@@ -0,0 +1,68 @@
+% -*- mode: erlang -*-
+{application, exmpp, [
+    {description, "XMPP/Jabber protocol oriented XML library"},
+    {vsn, "0.9.9"},
+    {modules, [
+        exmpp,
+        exmpp_caps,
+        exmpp_component,
+        exmpp_compress,
+        exmpp_dialback,
+        exmpp_dns,
+        exmpp_internals,
+        exmpp_utils,
+        exmpp_iq,
+        exmpp_jid,
+        exmpp_message,
+        exmpp_presence,
+        exmpp_stanza,
+        exmpp_stream,
+        exmpp_stringprep,
+        exmpp_sup,
+        exmpp_tls,
+        exmpp_xml,
+        exmpp_xmlstream,
+        exmpp_client_binding,
+        exmpp_client_compression,
+        exmpp_client_disco,
+        exmpp_client_legacy_auth,
+	exmpp_client_muc,
+        exmpp_client_privacy,
+        exmpp_client_pubsub,
+        exmpp_client_register,
+        exmpp_client_roster,
+        exmpp_client_sasl,
+        exmpp_client_session,
+        exmpp_client_tls,
+        exmpp_server_binding,
+        exmpp_server_compression,
+        exmpp_server_legacy_auth,
+        exmpp_server_privacy,
+        exmpp_server_sasl,
+        exmpp_server_session,
+        exmpp_server_tls,
+        exmpp_sasl_digest,
+        exmpp_session,
+        exmpp_socket,
+	ejabberd_socket,
+        stringprep,
+        tls,
+        xml,
+        xml_stream
+    ]},
+    {registered, [
+        exmpp_sup,
+        exmpp_compress,
+        exmpp_stringprep,
+        exmpp_stringprep_port,
+        exmpp_tls,
+        exmpp_xml
+    ]},
+    {applications, [
+        kernel,
+        stdlib
+    ]},
+    {mod, {exmpp, []}}
+]}.
+
+% vim:ft=erlang:ts=8:
diff --git a/src/exmpp.app.src.script b/src/exmpp.app.src.script
new file mode 100644
index 0000000..5694bb7
--- /dev/null
+++ b/src/exmpp.app.src.script
@@ -0,0 +1,21 @@
+% -*- mode: erlang -*-
+
+{application, Name, AppOpts} = lists:nth(1, CONFIG),
+
+%%%
+%%% If a git repository, Vsn is given by git describe
+%%%
+{vsn, BaseVsn} = lists:keyfind(vsn, 1, AppOpts),
+Vsn = case string:strip(os:cmd("git describe 2>/dev/null | sed 's/^v//' | sed 's/-\([0-9]\)-/-0\1-/'"), right, $\n) of
+	  "" -> BaseVsn;
+	  GitVsn -> GitVsn
+      end,
+
+%%%
+%%% Update vsn and modules in .app files
+%%%
+AppOpts2 = lists:ukeymerge(1, 
+	     lists:keysort(1, [{vsn, Vsn}]),
+	     lists:keysort(1, AppOpts)),
+
+[{application, Name, AppOpts2}].
diff --git a/src/exmpp_known_attrs.erl.es b/src/exmpp_known_attrs.erl.es
new file mode 100755
index 0000000..c98db61
--- /dev/null
+++ b/src/exmpp_known_attrs.erl.es
@@ -0,0 +1,34 @@
+#!/usr/bin/env escript
+%% -*- mode: erlang -*-
+
+main([ Known_ATTRS_Src ]) ->
+    io:format("% Generated by ~p~n", [filename:basename(escript:script_name())]),
+    Attributes = lists:usort(read_attrs(Known_ATTRS_Src)),
+    io:format("-module(exmpp_known_attrs).~n"
+              "-export([attr_as_list/1]).~n~n", []),
+    lists:foreach(fun (Abin) ->
+                          A = binary_to_atom(Abin, utf8),
+                          io:format("attr_as_list('~s') -> \"~s\";~n", [A, A])
+                  end, 
+                  Attributes),
+    io:format("attr_as_list(undefined) -> \"\";~n", []),
+    io:format("attr_as_list(A) when is_atom(A) -> atom_to_list(A);~n", []),
+    io:format("attr_as_list(S) when is_list(S) -> S.~n~n", []),
+    timer:sleep(10).
+
+read_attrs(Known_ATTRS_Src) ->
+    {ok, File} = file:open(Known_ATTRS_Src, [read, binary]),
+    read_attrs(File, io:get_line(File, ""), []).
+
+read_attrs(File, eof, Acc) ->
+    file:close(File),
+    lists:reverse(Acc);
+read_attrs(File, << $#, _/binary >>, Acc) ->
+    read_attrs(File, io:get_line(File, ""), Acc);
+read_attrs(File, << $\n >>, Acc) ->
+    read_attrs(File, io:get_line(File, ""), Acc);
+read_attrs(File, ATTR_bin, Acc) when is_binary(ATTR_bin) ->
+    Len = byte_size(ATTR_bin) - 1,
+    << ATTR:Len/binary, _/binary >> = ATTR_bin,
+    read_attrs(File, io:get_line(File, ""),
+	       [ATTR | Acc]).
diff --git a/src/exmpp_known_elems.erl.es b/src/exmpp_known_elems.erl.es
new file mode 100755
index 0000000..b0dc051
--- /dev/null
+++ b/src/exmpp_known_elems.erl.es
@@ -0,0 +1,34 @@
+#!/usr/bin/env escript
+%% -*- erlang -*-
+
+main([ Known_ELEMS_Src ]) ->
+    io:format("% Generated by ~p~n", [filename:basename(escript:script_name())]),
+    Elements = lists:usort(read_elems(Known_ELEMS_Src)),
+    io:format("-module(exmpp_known_elems).~n"
+              "-export([elem_as_list/1]).~n~n", []),
+    lists:foreach(fun (Ebin) ->
+                          E = binary_to_atom(Ebin, utf8),
+                          io:format("elem_as_list('~s') -> \"~s\";~n", [E, E])
+                  end, 
+                  Elements),
+    io:format("elem_as_list(undefined) -> \"\";~n", []),
+    io:format("elem_as_list(A) when is_atom(A) -> atom_to_list(A);~n", []),
+    io:format("elem_as_list(S) when is_list(S) -> S.~n~n", []),
+    timer:sleep(10).
+
+read_elems(Known_ELEMS_Src) ->
+    {ok, File} = file:open(Known_ELEMS_Src, [read, binary]),
+    read_elems(File, io:get_line(File, ""), []).
+
+read_elems(File, eof, Acc) ->
+    file:close(File),
+    lists:reverse(Acc);
+read_elems(File, << $#, _/binary >>, Acc) ->
+    read_elems(File, io:get_line(File, ""), Acc);
+read_elems(File, << $\n >>, Acc) ->
+    read_elems(File, io:get_line(File, ""), Acc);
+read_elems(File, EL_bin, Acc) when is_binary(EL_bin) ->
+    Len = byte_size(EL_bin) - 1,
+    << EL:Len/binary, _/binary >> = EL_bin,
+    read_elems(File, io:get_line(File, ""),
+	       [EL | Acc]).
diff --git a/src/exmpp_known_nss.erl.es b/src/exmpp_known_nss.erl.es
new file mode 100755
index 0000000..a81bfa5
--- /dev/null
+++ b/src/exmpp_known_nss.erl.es
@@ -0,0 +1,34 @@
+#!/usr/bin/env escript
+%% -*- erlang -*-
+
+main([ Known_NSS_Src ]) ->
+    io:format("% Generated by ~p~n", [filename:basename(escript:script_name())]),
+    Namespaces = lists:usort(read_nss(Known_NSS_Src)),
+    io:format("-module(exmpp_known_nss).~n"
+	      "-export([ns_as_list/1]).~n~n", []),
+    lists:foreach(fun (NSbin) ->
+			  NS = binary_to_atom(NSbin, utf8),
+			  io:format("ns_as_list('~s') -> \"~s\";~n", [NS, NS])
+		  end, 
+		  Namespaces),
+    io:format("ns_as_list(undefined) -> \"\";~n", []),
+    io:format("ns_as_list(A) when is_atom(A) -> atom_to_list(A);~n", []),
+    io:format("ns_as_list(S) when is_list(S) -> S.~n~n", []),
+    timer:sleep(10).
+
+read_nss(Known_NSS_Src) ->
+    {ok, File} = file:open(Known_NSS_Src, [read, binary]),
+    read_nss(File, io:get_line(File, ""), []).
+
+read_nss(File, eof, Acc) ->
+    file:close(File),
+    lists:reverse(Acc);
+read_nss(File, << $#, _/binary >>, Acc) ->
+    read_nss(File, io:get_line(File, ""), Acc);
+read_nss(File, << $\n >>, Acc) ->
+    read_nss(File, io:get_line(File, ""), Acc);
+read_nss(File, NS_bin, Acc) when is_binary(NS_bin) ->
+    Len = byte_size(NS_bin) - 1,
+    << NS:Len/binary, _/binary >> = NS_bin,
+    read_nss(File, io:get_line(File, ""),
+	     [NS | Acc]).