diff --git a/configure.in b/configure.in
index c542abf6de..506aceb1e3 100644
--- a/configure.in
+++ b/configure.in
@@ -48,7 +48,6 @@ AC_INIT(configure.in)
     AC_PROG_INSTALL
     AC_PROG_LN_S
     AC_PROG_MAKE_SET
-    AC_PROG_RANLIB
 
 # Checks for libraries.
 
@@ -586,17 +585,6 @@ AC_CHECK_HEADER(pcap.h,,[AC_ERROR(pcap.h not found ...)])
     echo
     exit 1
     fi
-
-    #we did not specify non-bundled-htp so use the built-in.
-    else
-    if test -d "libhtp"; then
-    echo "Going to try and build the bundled htp in htp/"
-    else
-    echo
-    echo "   ERROR! libhtp/ dir not found in source"
-    echo
-    exit 1
-    fi
     fi
 
    #even if we are using an installed htp lib we still need to gen Makefiles inside of htp
@@ -645,5 +633,4 @@ AC_SUBST(CFLAGS)
 AC_SUBST(LDFLAGS)
 AC_SUBST(CPPFLAGS)
 
-AC_CONFIG_FILES([libhtp/Makefile libhtp/htp/Makefile Makefile src/Makefile])
-AC_OUTPUT
+AC_OUTPUT(Makefile src/Makefile)
diff --git a/libhtp/Makefile.am b/libhtp/Makefile.am
index 4d28350443..25256f9e82 100755
--- a/libhtp/Makefile.am
+++ b/libhtp/Makefile.am
@@ -1,8 +1,6 @@
-
 SUBDIRS= $(GENERIC_LIBRARY_NAME) test
 
-DIST_SUBDIRS = $(GENERIC_LIBRARY_NAME)
+EXTRA_DIST = ChangeLog COPYING LICENSE LIBHTP_LICENSING_EXCEPTION docs/doxygen.conf docs/QUICK_START
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = htp.pc
-
diff --git a/libhtp/htp/Makefile.am b/libhtp/htp/Makefile.am
index ce4a9d3c88..fca67d4e00 100755
--- a/libhtp/htp/Makefile.am
+++ b/libhtp/htp/Makefile.am
@@ -5,10 +5,10 @@ c_sources = bstr.c hooks.c htp_config.c htp_connection_parser.c htp_request_apac
 library_includedir = $(includedir)/$(GENERIC_LIBRARY_NAME)
 library_include_HEADERS = $(h_sources)
 
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I. -I$(top_srcdir)
 AM_CFLAGS = -D_GNU_SOURCE -g -O2 -Wall -Wextra -std=gnu99 -pedantic
 
 lib_LTLIBRARIES= libhtp.la
-libhtp_la_SOURCES= $(h_sources) $(c_sources)
+libhtp_la_SOURCES= $(c_sources)
 libhtp_la_LDFLAGS= -version-info $(GENERIC_LIBRARY_VERSION) -release $(GENERIC_RELEASE)
-
+libhtp_la_DEPENDENCIES = $(libhtp_la_SOURCES) ../config.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 6cc160830c..4d507a2bc1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,8 @@
 noinst_HEADERS = action-globals.h \
-	app-layer-nbss.h debug.h decode-events.h \
+    app-layer-nbss.h app-layer-dcerpc-common.h \
+    debug.h decode-events.h \
 	flow-private.h queue.h source-nfq-prototypes.h \
-	suricata-common.h threadvars.h
+	suricata-common.h threadvars.h util-binsearch.h
 bin_PROGRAMS = suricata
 suricata_SOURCES = suricata.c suricata.h \
 runmodes.c runmodes.h \
@@ -193,7 +194,7 @@ suricata_LDFLAGS = $(all_libraries)
 
 if BUILD_LIBHTP
 suricata_LDADD = $(top_builddir)/libhtp/htp/libhtp.la
-INCLUDES += -I$(top_builddir)/libhtp
+INCLUDES += -I$(top_srcdir)/libhtp
 endif
 
 #suricata_CFLAGS = -Wall -fno-strict-aliasing