diff --git a/configure b/configure
index 12a1a4a..d8364c7 100755
--- a/configure
+++ b/configure
@@ -20279,7 +20279,7 @@ if test -n "$PK_BROWSER_PLUGIN_CFLAGS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
-			  mozilla-plugin	\\
+			  npapi-sdk		\\
 			  gio-unix-2.0		\\
 			  nspr \\
 			  cairo			\\
@@ -20287,7 +20287,7 @@ if test -n "$PK_BROWSER_PLUGIN_CFLAGS"; then
 			  gtk+-2.0 >= 2.14.0	\\
 			  dbus-glib-1\""; } >&5
   ($PKG_CONFIG --exists --print-errors "\
-			  mozilla-plugin	\
+			  npapi-sdk		\
 			  gio-unix-2.0		\
 			  nspr \
 			  cairo			\
@@ -20298,7 +20298,7 @@ if test -n "$PK_BROWSER_PLUGIN_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PK_BROWSER_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "\
-			  mozilla-plugin	\
+			  npapi-sdk		\
 			  gio-unix-2.0		\
 			  nspr \
 			  cairo			\
@@ -20316,7 +20316,7 @@ if test -n "$PK_BROWSER_PLUGIN_LIBS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
-			  mozilla-plugin	\\
+			  npapi-sdk	\\
 			  gio-unix-2.0		\\
 			  nspr \\
 			  cairo			\\
@@ -20324,7 +20324,7 @@ if test -n "$PK_BROWSER_PLUGIN_LIBS"; then
 			  gtk+-2.0 >= 2.14.0	\\
 			  dbus-glib-1\""; } >&5
   ($PKG_CONFIG --exists --print-errors "\
-			  mozilla-plugin	\
+			  npapi-sdk	\
 			  gio-unix-2.0		\
 			  nspr \
 			  cairo			\
@@ -20335,7 +20335,7 @@ if test -n "$PK_BROWSER_PLUGIN_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PK_BROWSER_PLUGIN_LIBS=`$PKG_CONFIG --libs "\
-			  mozilla-plugin	\
+			  npapi-sdk	\
 			  gio-unix-2.0		\
 			  nspr \
 			  cairo			\
@@ -20362,7 +20362,7 @@ else
 fi
         if test $_pkg_short_errors_supported = yes; then
 	        PK_BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
-			  mozilla-plugin	\
+			  npapi-sdk	\
 			  gio-unix-2.0		\
 			  nspr \
 			  cairo			\
@@ -20371,7 +20371,7 @@ fi
 			  dbus-glib-1" 2>&1`
         else
 	        PK_BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
-			  mozilla-plugin	\
+			  npapi-sdk	\
 			  gio-unix-2.0		\
 			  nspr \
 			  cairo			\
diff --git a/contrib/browser-plugin/pk-main.c b/contrib/browser-plugin/pk-main.c
index 4f6fc75..f4d8047 100644
--- a/contrib/browser-plugin/pk-main.c
+++ b/contrib/browser-plugin/pk-main.c
@@ -539,7 +539,7 @@ NP_Shutdown ()
 /**
  * NP_GetMIMEDescription:
  **/
-char *
+const char *
 NP_GetMIMEDescription (void)
 {
 	pk_debug ("NP_GetMIMEDescription");