--- a/modules/mongodbbackend/Makefile.am
+++ b/modules/mongodbbackend/Makefile.am
@@ -1,10 +1,10 @@
 AM_CPPFLAGS=@THREADFLAGS@ $(BOOST_CPPFLAGS)
 EXTRA_DIST=OBJECTFILES OBJECTLIBS 
 
-INCLUDES=-I/opt/mongo/include/mongo/
+INCLUDES=-I/usr/include/mongo/
 
 lib_LTLIBRARIES = libmongodbbackend.la
 
 libmongodbbackend_la_SOURCES=mongodbbackend.cc mongodbbackend.hh minimal.cc slave.cc master.cc reload.cc private.cc dnssec.cc supermaster.cc crc32.cc
-libmongodbbackend_la_LDFLAGS=-module -avoid-version -L/opt/mongo/lib64 $(BOOST_THREAD_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS)  -lmongoclient $(BOOST_THREAD_LIBS) $(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS) 
+libmongodbbackend_la_LDFLAGS=-module -avoid-version $(BOOST_THREAD_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS)  -lmongoclient $(BOOST_THREAD_LIBS) $(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS)
 
--- a/modules/mongodbbackend/OBJECTLIBS
+++ b/modules/mongodbbackend/OBJECTLIBS
@@ -1 +1 @@
--L/opt/mongo/lib64/ -lmongoclient -lboost_thread -lboost_filesystem -lboost_system
+-lmongoclient -lboost_thread -lboost_filesystem -lboost_system
--- a/modules/mongodbbackend/mongodbbackend.hh
+++ b/modules/mongodbbackend/mongodbbackend.hh
@@ -106,7 +106,7 @@
 
     mongo::DBClientConnection m_db;
     
-    auto_ptr<mongo::DBClientCursor> cursor;
+	std::auto_ptr<mongo::DBClientCursor> cursor;
     
     string q_name;
     
