=== modified file 'configure.ac'
--- configure.ac	2011-04-24 00:14:35 +0000
+++ configure.ac	2011-04-30 21:01:07 +0000
@@ -65,8 +65,8 @@
 AC_MSG_RESULT($all_plugins)
 
 # The full list of plugins
-allowed_plugins="bzr chrome eog geany rhythmbox vim emacs tomboy telepathy xchat"
-# currently disabled = "epiphany firefox-libzg"
+allowed_plugins="bzr chrome eog firefox-libzg geany rhythmbox vim emacs tomboy telepathy xchat"
+# currently disabled = "epiphany"
 
 # npapi-plugin has a template Makefile.am, but don't use it directly
 #   - see chrome's Makefile.am for how to compile it
@@ -122,6 +122,7 @@
 			AC_SUBST(XPIDL_BIN)
 			XUL_IDLDIR="`$PKG_CONFIG --variable=idldir libxul`"
 			AC_SUBST(XUL_IDLDIR)
+            AC_DEFINE(MOZ_NO_MOZALLOC, ["For Mozilla Firefox 4"])
 		;;
 		geany)
 			if test "${HAVE_LIBZG}" != "yes" ; then

=== modified file 'firefox-libzg/Makefile.am'
--- firefox-libzg/Makefile.am	2010-06-08 00:24:42 +0000
+++ firefox-libzg/Makefile.am	2011-04-30 23:22:50 +0000
@@ -5,7 +5,8 @@
 
 local-install: all
 	$(MAKE) -C extension $@
-	cp ZeitgeistDataprovider.xpi ~/.mozilla/firefox/$(TARGET_PROFILE)/extensions
+	unzip ZeitgeistDataprovider.xpi -d ~/xpcom_firefox\@zeitgeist-project.com
+	mv ~/xpcom_firefox\@zeitgeist-project.com ~/.mozilla/firefox/$(TARGET_PROFILE)/extensions
 
 local-uninstall:
 	$(MAKE) -C extension $@

=== modified file 'firefox-libzg/extension/chrome.manifest'
--- firefox-libzg/extension/chrome.manifest	2010-05-11 15:51:49 +0000
+++ firefox-libzg/extension/chrome.manifest	2011-04-28 19:33:49 +0000
@@ -1,2 +1,4 @@
+binary-component	components/libzeitgeist_xpcom.so
+interfaces	components/zeitgeist.xpt
 content		zeitgeist				chrome/content/
 overlay		chrome://browser/content/browser.xul	chrome://zeitgeist/content/zeitgeist.xul

=== modified file 'firefox-libzg/extension/components/ZeitgeistComponent.cpp'
--- firefox-libzg/extension/components/ZeitgeistComponent.cpp	2010-05-12 06:44:01 +0000
+++ firefox-libzg/extension/components/ZeitgeistComponent.cpp	2011-04-28 19:33:01 +0000
@@ -20,20 +20,31 @@
  */
  
  
-#include "nsIGenericFactory.h"
+#include "mozilla/ModuleUtils.h"
 #include "zeitgeist.h"
 #include "zeitgeistextend.h"
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(zeitgeistextend)
 
-static nsModuleComponentInfo components[] =
-{
-  {
-    ZEITGEIST_COMPONENT_CLASSNAME,
-    ZEITGEIST_COMPONENT_CID,
-    ZEITGEIST_COMPONENT_CONTRACTID,
-    zeitgeistextendConstructor,
-  }
-};
-
-NS_IMPL_NSGETMODULE("ZeitgeistModule", components)
+NS_DEFINE_NAMED_CID(ZEITGEIST_COMPONENT_CID);
+
+static const mozilla::Module::CIDEntry kZeitgeistCIDs[] = {
+  { &kZEITGEIST_COMPONENT_CID, false, NULL, zeitgeistextendConstructor },
+  { NULL }
+};
+
+static const mozilla::Module::ContractIDEntry kZeitgeistContracts[] = {
+  { ZEITGEIST_COMPONENT_CONTRACTID, &kZEITGEIST_COMPONENT_CID },
+  { NULL }
+};
+
+static const mozilla::Module kZeitgeistModule = {
+  mozilla::Module::kVersion,
+  kZeitgeistCIDs,
+  kZeitgeistContracts,
+  NULL
+};
+
+NSMODULE_DEFN(ZeitgeistModule) = &kZeitgeistModule;
+
+NS_IMPL_MOZILLA192_NSGETMODULE(&kZeitgeistModule)

=== modified file 'firefox-libzg/extension/install.rdf'
--- firefox-libzg/extension/install.rdf	2010-05-16 08:58:25 +0000
+++ firefox-libzg/extension/install.rdf	2011-04-30 21:02:22 +0000
@@ -5,6 +5,7 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>xpcom_firefox@zeitgeist-project.com</em:id>
+    <em:unpack>true</em:unpack>
     <em:version>0.1</em:version>
     <em:type>2</em:type>
    
@@ -13,8 +14,8 @@
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:minVersion>3.5</em:minVersion>
-        <em:maxVersion>3.6.*</em:maxVersion>
+        <em:minVersion>4.0</em:minVersion>
+        <em:maxVersion>4.0.*</em:maxVersion>
       </Description>
     </em:targetApplication>