diff --git a/src/Makefile.am b/src/Makefile.am
index 166555e8c0..6619595054 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,7 +51,6 @@ noinst_HEADERS = \
 	app-layer-ssh.h \
 	app-layer-ssl.h \
 	app-layer-tftp.h \
-	autoconf.h \
 	build-info.h \
 	conf.h \
 	conf-yaml-loader.h \
@@ -1298,6 +1297,10 @@ install-headers:
 		$(INSTALL_DATA) $$header "$(DESTDIR)${includedir}/suricata"; \
 	done
 
+# Until we can remove autoconf.h from our headers, we need to to
+# provide this for library/plugin users.
+	$(INSTALL_DATA) autoconf.h "$(DESTDIR)${includedir}/suricata"
+
 # set the include path found by configure
 AM_CPPFLAGS = $(all_includes)
 
diff --git a/src/suricata-common.h b/src/suricata-common.h
index 297a6fc452..23bf6335ea 100644
--- a/src/suricata-common.h
+++ b/src/suricata-common.h
@@ -48,7 +48,7 @@
 #endif
 
 #if HAVE_CONFIG_H
-#include <autoconf.h>
+#include "autoconf.h"
 #endif
 
 #ifndef CLS