diff --git a/Makefile.am b/Makefile.am
index 788d37c..fa2af44 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
-CFLAGS = -g -Wall
+AM_CFLAGS = -g -Wall
 
 PARSER_CFLAGS=@PARSER_CFLAGS@
 PARSER_LIBS=@PARSER_LIBS@
@@ -13,6 +13,9 @@ STROPHE_LIBS = libstrophe.a $(PARSER_LIBS) $(SSL_LIBS)
 ## Main build targets
 lib_LIBRARIES = libstrophe.a
 
+lib_LTLIBRARIES = libstrophe.la
+
+
 libstrophe_a_CFLAGS=$(STROPHE_FLAGS) $(PARSER_CFLAGS)
 libstrophe_a_SOURCES = src/auth.c src/conn.c src/ctx.c \
 	src/event.c src/handler.c src/hash.c \
@@ -22,6 +25,14 @@ libstrophe_a_SOURCES = src/auth.c src/conn.c src/ctx.c \
 	src/common.h src/hash.h src/md5.h src/ostypes.h src/parser.h \
 	src/sasl.h src/sha1.h src/sock.h src/thread.h src/tls.h src/util.h
 
+libstrophe_la_SOURCES = src/auth.c src/conn.c src/ctx.c \
+	src/event.c src/handler.c src/hash.c \
+	src/jid.c src/md5.c src/sasl.c src/sha1.c \
+	src/snprintf.c src/sock.c src/stanza.c src/thread.c \
+	src/tls_openssl.c src/util.c \
+	src/common.h src/hash.h src/md5.h src/ostypes.h src/parser.h \
+	src/sasl.h src/sha1.h src/sock.h src/thread.h src/tls.h src/util.h
+
 if PARSER_EXPAT
 libstrophe_a_SOURCES += src/parser_expat.c
 else
diff --git a/configure.ac b/configure.ac
index a3e48ee..4cc993a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,6 @@
-AC_INIT([libstrophe], [0.8-snapshot], [jack@metajack.im])
+AC_INIT([libstrophe], [0.8.5], [jack@metajack.im])
 AM_INIT_AUTOMAKE
+LT_INIT([dlopen])
 
 AC_PROG_CC
 AC_PROG_RANLIB