diff --git a/browser-plugin/Makefile.am b/browser-plugin/Makefile.am
index 03cc13ad0..4bfb35048 100644
--- a/browser-plugin/Makefile.am
+++ b/browser-plugin/Makefile.am
@@ -1,5 +1,5 @@
 
-mozillalibdir = $(datadir)/mozilla/plugins
+mozillalibdir = $(libdir)/mozilla/plugins
 
 mozillalib_LTLIBRARIES = libgnome-shell-browser-plugin.la
 
@@ -9,7 +9,11 @@ libgnome_shell_browser_plugin_la_LIBADD = 	\
 	$(BROWSER_PLUGIN_LIBS)
 
 libgnome_shell_browser_plugin_la_SOURCES = 	\
-	browser-plugin.c
+	browser-plugin.c \
+	npapi/npapi.h \
+	npapi/npfunctions.h \
+	npapi/npruntime.h \
+	npapi/nptypes.h
 
 libgnome_shell_browser_plugin_la_CFLAGS = 	\
 	$(BROWSER_PLUGIN_CFLAGS)		\
diff --git a/configure.ac b/configure.ac
index a31793715..f2db9eb91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -216,6 +216,7 @@ AC_CONFIG_FILES([
   js/Makefile
   js/misc/config.js
   src/Makefile
+  browser-plugin/Makefile
   tests/Makefile
   po/Makefile.in
   man/Makefile