diff -Naur pdns-3.2/pdns/backends/bind/Makefile.am pdns-3.2.oden/pdns/backends/bind/Makefile.am
--- pdns-3.2/pdns/backends/bind/Makefile.am	2013-01-17 10:16:52.000000000 +0100
+++ pdns-3.2.oden/pdns/backends/bind/Makefile.am	2013-01-18 13:21:08.713650228 +0100
@@ -45,23 +45,23 @@
 
 zone2ldap_LDFLAGS=@THREADFLAGS@  
 if HAVE_LIBPOLARSSL
-zone2ldap_LDADD=
+zone2ldap_LDADD=-lpolarssl
 else
-zone2ldap_LDADD= ../../ext/polarssl-1.1.2/library/libpolarssl.a
+zone2ldap_LDADD= -lpolarssl
 endif
 
 zone2sql_LDFLAGS=@THREADFLAGS@  
 if HAVE_LIBPOLARSSL
-zone2sql_LDADD=
+zone2sql_LDADD=-lpolarssl
 else
-zone2sql_LDADD= ../../ext/polarssl-1.1.2/library/libpolarssl.a 
+zone2sql_LDADD= -lpolarssl
 endif
 
 zone2json_LDFLAGS=@THREADFLAGS@
 if HAVE_LIBPOLARSSL
-zone2json_LDADD=
+zone2json_LDADD=-lpolarssl
 else
-zone2json_LDADD= ../../ext/polarssl-1.1.2/library/libpolarssl.a
+zone2json_LDADD= -lpolarssl
 endif
 
 AM_LFLAGS = -s -i
diff -Naur pdns-3.2/pdns/Makefile.am pdns-3.2.oden/pdns/Makefile.am
--- pdns-3.2/pdns/Makefile.am	2013-01-17 10:16:52.000000000 +0100
+++ pdns-3.2.oden/pdns/Makefile.am	2013-01-18 13:22:24.466648312 +0100
@@ -1,9 +1,4 @@
-if HAVE_LIBPOLARSSL
 AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) -I ext/rapidjson/include
-else
-AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) -Iext/polarssl-1.1.2/include -Iext/rapidjson/include
-
-endif
 AM_CPPFLAGS=-Ibackends/bind $(BOOST_CPPFLAGS) @THREADFLAGS@ $(LIBCURL_CFLAGS)
 
 if BOTAN110
@@ -20,11 +15,7 @@
 	no-dnssec.schema.mysql.sql no-dnssec.schema.pgsql.sql no-dnssec.schema.sqlite3.sql \
 	bind-dnssec.schema.sqlite3.sql
 
-if HAVE_LIBPOLARSSL
 SUBDIRS= backends
-else
-SUBDIRS= ext/polarssl-1.1.2 backends 
-endif
 
 BUILT_SOURCES=bind-dnssec.schema.sqlite3.sql.h
 
@@ -69,7 +60,7 @@
 
 #
 pdns_server_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_SERIALIZATION_LDFLAGS) -rdynamic 
-pdns_server_LDADD= ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_SERIALIZATION_LIBS) $(LUA_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
+pdns_server_LDADD= -lpolarssl $(BOOST_SERIALIZATION_LIBS) $(LUA_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
 
 if BOTAN110
 pdns_server_SOURCES += botan110signers.cc botansigners.cc
@@ -106,7 +97,7 @@
 
 
 pdnssec_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
-pdnssec_LDADD= ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_SERIALIZATION_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
+pdnssec_LDADD= -lpolarssl $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_SERIALIZATION_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
 
 if BOTAN110
 pdnssec_SOURCES += botan110signers.cc botansigners.cc
@@ -135,7 +126,7 @@
     dnswriter.hh dnssecinfra.cc md5.cc \
 	misc.cc misc.hh rcpgenerator.cc rcpgenerator.hh base64.cc base64.hh unix_utility.cc \
 	logger.cc statbag.cc qtype.cc sillyrecords.cc nsecrecords.cc base32.cc
-nsec3dig_LDFLAGS= -Lext/polarssl-1.1.2/library 	
+nsec3dig_LDFLAGS=
 nsec3dig_LDADD= -lpolarssl
 
 toysdig_SOURCES=toysdig.cc sstuff.hh dnsparser.cc dnsparser.hh dnsrecords.cc dnswriter.cc dnslabeltext.cc dnswriter.hh \
@@ -159,7 +150,7 @@
 if HAVE_LIBPOLARSSL
 tsig_tests_LDFLAGS=
 else
-tsig_tests_LDFLAGS= -Lext/polarssl-1.1.2/library 	
+tsig_tests_LDFLAGS=
 endif
 tsig_tests_LDADD= -lpolarssl
 
diff -Naur pdns-3.2/pdns/polarrsakeyinfra.cc pdns-3.2.oden/pdns/polarrsakeyinfra.cc
--- pdns-3.2/pdns/polarrsakeyinfra.cc	2013-01-17 10:16:52.000000000 +0100
+++ pdns-3.2.oden/pdns/polarrsakeyinfra.cc	2013-01-18 13:27:52.047640118 +0100
@@ -1,4 +1,4 @@
-#ifdef HAVE_LIBPOLARSSLSSL
+#ifdef HAVE_LIBPOLARSSL
 #include <polarssl/rsa.h>
 #include <polarssl/base64.h>
 #include <polarssl/sha1.h>