diff --git a/mozilla/webtools/bugzilla/config.cgi b/mozilla/webtools/bugzilla/config.cgi
index 80b64b04784..d1ad3cdc948 100755
--- a/mozilla/webtools/bugzilla/config.cgi
+++ b/mozilla/webtools/bugzilla/config.cgi
@@ -1,4 +1,4 @@
-#!/usr/bonsaitools/bin/perl -w
+#!/usr/bin/perl -wT
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public
@@ -30,6 +30,7 @@ use diagnostics;
 use strict;
 
 # Include the Bugzilla CGI and general utility library.
+use lib qw(.);
 require "CGI.pl";
 
 # Connect to the database so we can check whether the user is a member
diff --git a/mozilla/webtools/bugzilla/template/en/default/config.js.tmpl b/mozilla/webtools/bugzilla/template/en/default/config.js.tmpl
index 62582f6df66..26d089fd69c 100644
--- a/mozilla/webtools/bugzilla/template/en/default/config.js.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/config.js.tmpl
@@ -22,6 +22,8 @@
 // This file contains the installation specific values for QuickSearch
 // and other Bugzilla clients.  See quicksearch.js for more details.
 //
+// Note: this interface is experimental and under development.
+// We may and probably will make breaking changes to it in the future.
 
 // the global bugzilla url
 var installation = {
diff --git a/mozilla/webtools/bugzilla/template/en/default/config.rdf.tmpl b/mozilla/webtools/bugzilla/template/en/default/config.rdf.tmpl
index 54308408b77..6aa51f65702 100644
--- a/mozilla/webtools/bugzilla/template/en/default/config.rdf.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/config.rdf.tmpl
@@ -20,6 +20,9 @@
   #%]
 
 <?xml version="1.0"?>
+<!-- Note: this interface is experimental and under development.
+   - We may and probably will make breaking changes to it in the future. -->
+
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      xmlns:bz="http://www.bugzilla.org/rdf#">