diff --git a/Makefile.am b/Makefile.am
index e1d5774b..6ccf77b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS=-I m4
 SUBDIRS=lib src
 EXTRA_DIST=server.html
 docs:
diff --git a/configure.ac b/configure.ac
index b76dfb23..2c2cd76f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,14 +5,16 @@ AC_PREREQ([2.60])
 m4_include([version.m4])
 AC_INIT(MistServer, VERSION_NUMBER, contact@ddvtech.com)
 AC_CONFIG_SRCDIR([src/buffer.cpp])
+AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
+LT_INIT
 
 # Checks for programs.
 AC_PROG_CXX
 AC_PROG_CC
 
 # Checks for libraries.
-AC_PROG_RANLIB
+AC_CHECK_LIB(ssl, RC4)
 
 # Checks for header files.
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h])
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 265f87da..2a2f0d1f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,15 +1,20 @@
-noinst_LIBRARIES=libamf.a libauth.a libbase64.a libconfig.a libcrypto.a libdtsc.a libflv_tag.a libhttp_parser.a libjson.a libprocs.a librtmpchunks.a libsocket.a libtinythread.a libmp4.a
-libamf_a_SOURCES=amf.h amf.cpp
-libauth_a_SOURCES=auth.h auth.cpp
-libbase64_a_SOURCES=base64.h base64.cpp
-libconfig_a_SOURCES=config.h config.cpp
-libcrypto_a_SOURCES=crypto.h crypto.cpp
-libdtsc_a_SOURCES=dtsc.h dtsc.cpp
-libflv_tag_a_SOURCES=flv_tag.h flv_tag.cpp
-libhttp_parser_a_SOURCES=http_parser.h http_parser.cpp
-libjson_a_SOURCES=json.h json.cpp
-libprocs_a_SOURCES=procs.h procs.cpp
-librtmpchunks_a_SOURCES=rtmpchunks.h rtmpchunks.cpp
-libsocket_a_SOURCES=socket.h socket.cpp
-libtinythread_a_SOURCES=tinythread.h tinythread.cpp
-libmp4_a_SOURCES=mp4.h mp4.cpp
+noinst_LTLIBRARIES=libamf.la libauth.la libbase64.la libconfig.la libcrypto.la libdtsc.la libflv_tag.la libhttp_parser.la libjson.la libprocs.la librtmpchunks.la libsocket.la libtinythread.la libmp4.la
+libamf_la_SOURCES=amf.h amf.cpp
+libauth_la_SOURCES=auth.h auth.cpp
+libauth_la_LIBADD=-lssl -lcrypto
+libbase64_la_SOURCES=base64.h base64.cpp
+libconfig_la_SOURCES=config.h config.cpp
+libcrypto_la_SOURCES=crypto.h crypto.cpp
+libcrypto_la_LIBADD=-lssl -lcrypto
+libdtsc_la_SOURCES=dtsc.h dtsc.cpp
+libflv_tag_la_SOURCES=flv_tag.h flv_tag.cpp
+libflv_tag_la_LIBADD=./libamf.la ./libsocket.la
+libhttp_parser_la_SOURCES=http_parser.h http_parser.cpp
+libjson_la_SOURCES=json.h json.cpp
+libprocs_la_SOURCES=procs.h procs.cpp
+librtmpchunks_la_SOURCES=rtmpchunks.h rtmpchunks.cpp
+librtmpchunks_la_LIBADD=./libflv_tag.la -lssl -lcrypto
+libsocket_la_SOURCES=socket.h socket.cpp
+libtinythread_la_SOURCES=tinythread.h tinythread.cpp
+libtinythread_la_LIBADD=-lpthread
+libmp4_la_SOURCES=mp4.h mp4.cpp