diff --git a/xpinstall/notifier/SoftwareUpdate-Source-1.rdf b/xpinstall/notifier/SoftwareUpdate-Source-1.rdf
index 5fbbb8dac241..acf677bd1a4a 100644
--- a/xpinstall/notifier/SoftwareUpdate-Source-1.rdf
+++ b/xpinstall/notifier/SoftwareUpdate-Source-1.rdf
@@ -3,27 +3,19 @@
 
   <RDF:Bag about="NC:SoftwareUpdateRoot">
     <RDF:li>
-       <RDF:Bag about="NC:SoftwarePackages" NC:title="New Software">
+       <RDF:Bag about="NC:SoftwarePackages" NC:title="Netscape Updates" NC:url="http://home.netscape.com">
 
             <RDF:li>
                 <RDF:Description ID="AimUpdate344">
-                 <NC:type resource="http://home.netscape.com/NC-rdf#SoftwarePackage" />
-                 <NC:title>AOL AIM</NC:title>
-                 <NC:description>An Instant Message Client</NC:description>
                  <NC:version>3.4.1.12</NC:version>
                  <NC:registryKey>/AOL/AIM/</NC:registryKey>
-                 <NC:url>http://home.netscape.com/index.html</NC:url>
                </RDF:Description>
             </RDF:li>
     
             <RDF:li>
                <RDF:Description ID="PGPPlugin345">
-                 <NC:type resource="http://home.netscape.com/NC-rdf#SoftwarePackage" />
-                 <NC:title>PGP Plugin For Mozilla</NC:title>
-                 <NC:description>A high grade encryption plugin</NC:description>
                  <NC:version>1.1.2.0</NC:version>
                  <NC:registryKey>/PGP/ROCKS/</NC:registryKey>
-                 <NC:url>http://home.netscape.com/index.html</NC:url>
                </RDF:Description>
             </RDF:li>
 
diff --git a/xpinstall/notifier/makefile.win b/xpinstall/notifier/makefile.win
index 6d8e919bd2ae..7ca1b1c3ecff 100644
--- a/xpinstall/notifier/makefile.win
+++ b/xpinstall/notifier/makefile.win
@@ -27,6 +27,7 @@ DLLNAME=xpiflash
 DLL=.\$(OBJDIR)\$(DLLNAME).dll
 
 LLIBS =                                \
+        $(DIST)\lib\libreg32.lib       \
         $(DIST)\lib\xpcom.lib          \
         $(LIBNSPR)                     \
         $(NULL)
@@ -35,23 +36,10 @@ LLIBS =                                \
 include <$(DEPTH)\config\rules.mak>
 
 install:: $(DLL)
-#    $(MAKE_INSTALL) folder-closed.gif           $(DIST)\bin\res\xpinstall
-#    $(MAKE_INSTALL) folder-open.gif             $(DIST)\bin\res\xpinstall
-#    $(MAKE_INSTALL) package.gif                 $(DIST)\bin\res\xpinstall
-#    $(MAKE_INSTALL) SoftwareUpdate.css          $(DIST)\bin\res\xpinstall
-#    $(MAKE_INSTALL) SoftwareUpdate.js           $(DIST)\bin\res\xpinstall
-#    $(MAKE_INSTALL) SoftwareUpdate.xul          $(DIST)\bin\res\xpinstall
-#    $(MAKE_INSTALL) SoftwareUpdates.rdf         $(DIST)\bin\res\xpinstall
-#    $(MAKE_INSTALL) SoftwareUpdate-Source-1.rdf $(DIST)\bin\res\xpinstall
+    $(MAKE_INSTALL) SoftwareUpdates.rdf         $(DIST)\bin\res\xpinstall
+    $(MAKE_INSTALL) SoftwareUpdate-Source-1.rdf $(DIST)\bin\res\xpinstall
     $(MAKE_INSTALL) $(DLL)                      $(DIST)\bin\components
 
 clobber::
-#    rm -f $(DIST)\res\xpinstall\folder-closed.gif          
-#    rm -f $(DIST)\res\xpinstall\folder-open.gif            
-#    rm -f $(DIST)\res\xpinstall\package.gif                
-#    rm -f $(DIST)\res\xpinstall\SoftwareUpdatePackage.gif  
-#    rm -f $(DIST)\res\xpinstall\SoftwareUpdate.css         
-#    rm -f $(DIST)\res\xpinstall\SoftwareUpdate.js          
-#    rm -f $(DIST)\res\xpinstall\SoftwareUpdate.xul         
-#    rm -f $(DIST)\res\xpinstall\SoftwareUpdates.rdf        
-#    rm -f $(DIST)\res\xpinstall\SoftwareUpdate-Source-1.rdf
+    rm -f $(DIST)\res\xpinstall\SoftwareUpdates.rdf        
+    rm -f $(DIST)\res\xpinstall\SoftwareUpdate-Source-1.rdf
diff --git a/xpinstall/notifier/nsXPIFlash.cpp b/xpinstall/notifier/nsXPIFlash.cpp
index 617b88c2321f..723c639fbb83 100644
--- a/xpinstall/notifier/nsXPIFlash.cpp
+++ b/xpinstall/notifier/nsXPIFlash.cpp
@@ -27,6 +27,7 @@
 #include "nsISupports.h"
 #include "nsRDFCID.h"
 
+#include "VerReg.h"
 
 #define NC_XPIFLASH_SOURCES     "NC:SoftwareUpdateDataSources"
 #define NC_XPIFLASH_PACKAGES    "NC:SoftwarePackages"
@@ -65,7 +66,10 @@ private:
     nsresult Init();
     nsresult SynchronouslyOpenRemoteDataSource(const char* aURL, nsIRDFDataSource** aResult);
     nsresult AddNewSoftwareFromDistributor(nsIRDFResource *inDistributor);
-
+    PRBool IsNewerOrUninstalled(const char* regKey, const char* versionString);
+    PRInt32 CompareVersions(VERSION *oldversion, VERSION *newVersion);
+    void   StringToVersionNumbers(const nsString& version, int32 *aMajor, int32 *aMinor, int32 *aRelease, int32 *aBuild);
+    
     nsCOMPtr<nsIRDFDataSource> mInner;
     nsIRDFService* mRDF;
 
@@ -220,7 +224,7 @@ nsXPINotifierImpl::Init()
 
                     rv = AddNewSoftwareFromDistributor(aDistributor);
                     if (NS_FAILED(rv)) break;
-
+                    
                     distributorEnumerator->HasMoreElements(&moreElements);
                 }
             }
@@ -268,58 +272,70 @@ nsXPINotifierImpl::AddNewSoftwareFromDistributor(nsIRDFResource *inDistributor)
 
                     nsCOMPtr<nsIRDFResource> aPackage(do_QueryInterface(i, &rv));
                     if (NS_FAILED(rv)) break;
-
-                    // do whatever here
-        
-                    nsCOMPtr<nsIRDFNode> nameNode;
+    
+                    
+                    // Get the version information
+                    nsCOMPtr<nsIRDFNode> versionNode;
                     distributorDataSource->GetTarget(aPackage, 
-                                                     kXPI_NotifierPackage_Title, 
+                                                     kXPI_NotifierPackage_Version, 
                                                      PR_TRUE, 
-                                                     getter_AddRefs(nameNode));
+                                                     getter_AddRefs(versionNode));
 
-                    nsCOMPtr<nsIRDFLiteral> title(do_QueryInterface(nameNode, &rv));
+                    nsCOMPtr<nsIRDFLiteral> version(do_QueryInterface(versionNode, &rv));
                     if (NS_FAILED(rv)) break;
-                   
-                    // lets asert now..
-                    
-                    nsCOMPtr<nsIRDFLiteral> source;
-                    nsString sourceString = "Software Notification";
-        
-                    rv = mRDF->GetLiteral(sourceString.GetUnicode(), getter_AddRefs(source));
-                    mInner->Assert(aPackage, kNC_Type, kXPI_Notifier_Type, PR_TRUE);
-                    mInner->Assert(aPackage, kNC_Source, source, PR_TRUE);
-                    mInner->Assert(aPackage, kNC_Description, title, PR_TRUE);
-                    
 
-                    //Supposedly rdf will convert this into a localized time string.
-                    nsCOMPtr<nsIRDFLiteral> timeStamp;
-                    nsString timeStampString;
-
-	                PRExplodedTime explode;
-	                PR_ExplodeTime( PR_Now(), PR_LocalTimeParameters, &explode);
-	                char buffer[128];
-	                PR_FormatTime(buffer, sizeof(buffer), "%m/%d/%Y %I:%M %p", &explode);
-	                timeStampString = buffer;
-	
-	                rv = mRDF->GetLiteral(timeStampString.GetUnicode(), getter_AddRefs(timeStamp));
-	                if(NS_SUCCEEDED(rv))
-	                {
-		                mInner->Assert(aPackage, kNC_TimeStamp, timeStamp, PR_TRUE);
-	                }
-
-	                nsCOMPtr<nsIRDFNode> urlNode;
+                    // Get the regkey information
+                    nsCOMPtr<nsIRDFNode> regkeyNode;
                     distributorDataSource->GetTarget(aPackage, 
-                                                     kXPI_NotifierPackage_URL, 
+                                                     kXPI_NotifierPackage_RegKey, 
                                                      PR_TRUE, 
-                                                     getter_AddRefs(urlNode));
+                                                     getter_AddRefs(regkeyNode));
 
-                    nsCOMPtr<nsIRDFLiteral> url(do_QueryInterface(urlNode, &rv));
+                    nsCOMPtr<nsIRDFLiteral> regkey(do_QueryInterface(regkeyNode, &rv));
                     if (NS_FAILED(rv)) break;
+
+                    // convert them into workable nsAutoStrings
+                    PRUnichar* regkeyCString;
+                    regkey->GetValue(&regkeyCString);
+                    nsString regKeyString(regkeyCString);
                     
-                    mInner->Assert(aPackage, kNC_URL, url, PR_TRUE);
-	                
-                    mInner->Assert(kNC_FlashRoot, kNC_Child, aPackage, PR_TRUE);
-                
+                    PRUnichar* versionCString;
+                    version->GetValue(&versionCString);
+                    nsString versionString(versionCString);
+                    
+
+                    // check to see if this software title should be "flashed"
+                    if (IsNewerOrUninstalled(nsAutoCString(regKeyString), nsAutoCString(versionString)))
+                    {
+                        //assert into flash
+                        
+                        nsCOMPtr<nsIRDFNode> urlNode;
+                        distributorDataSource->GetTarget(kXPI_NotifierPackages, 
+                                                         kXPI_NotifierPackage_URL, 
+                                                         PR_TRUE, 
+                                                         getter_AddRefs(urlNode));
+
+                        nsCOMPtr<nsIRDFLiteral> url(do_QueryInterface(urlNode, &rv));
+                        if (NS_FAILED(rv)) break;
+
+
+                        nsCOMPtr<nsIRDFNode> titleNode;
+                        distributorDataSource->GetTarget(kXPI_NotifierPackages, 
+                                                         kXPI_NotifierPackage_Title, 
+                                                         PR_TRUE, 
+                                                         getter_AddRefs(titleNode));
+
+                        nsCOMPtr<nsIRDFLiteral> title(do_QueryInterface(titleNode, &rv));
+                        if (NS_FAILED(rv)) break;
+
+                        mInner->Assert(aPackage, kNC_Type, kXPI_Notifier_Type, PR_TRUE);
+                        mInner->Assert(aPackage, kNC_Source, title, PR_TRUE);
+                        mInner->Assert(aPackage, kNC_URL, url, PR_TRUE);
+
+                        mInner->Assert(kNC_FlashRoot, kNC_Child, aPackage, PR_TRUE);
+                        break;
+
+                    }
                 }
             }
         }
@@ -328,6 +344,136 @@ nsXPINotifierImpl::AddNewSoftwareFromDistributor(nsIRDFResource *inDistributor)
     return NS_OK;
 }
 
+PRBool 
+nsXPINotifierImpl::IsNewerOrUninstalled(const char* regKey, const char* versionString)
+{
+    PRBool needJar = PR_FALSE;
+
+    REGERR status = VR_ValidateComponent( (char*) regKey );
+
+    if ( status == REGERR_NOFIND || status == REGERR_NOFILE )
+    {
+        // either component is not in the registry or it's a file
+        // node and the physical file is missing
+        needJar = PR_TRUE;
+    }
+    else
+    {
+        VERSION oldVersion;
+
+        status = VR_GetVersion( (char*)regKey, &oldVersion );
+        
+        if ( status != REGERR_OK )
+        {
+            needJar = PR_TRUE;
+        }
+        else 
+        {
+            VERSION newVersion;
+
+            StringToVersionNumbers(versionString, &(newVersion).major, &(newVersion).minor, &(newVersion).release, &(newVersion).build);
+            
+            if ( CompareVersions(&oldVersion, &newVersion) < 0 )
+                needJar = PR_TRUE;
+        }
+    }
+    return needJar;
+}
+
+
+PRInt32
+nsXPINotifierImpl::CompareVersions(VERSION *oldversion, VERSION *newVersion)
+{
+    PRInt32 diff;
+    
+    if ( oldversion->major == newVersion->major ) 
+    {
+        if ( oldversion->minor == newVersion->minor ) 
+        {
+            if ( oldversion->release == newVersion->release ) 
+            {
+                if ( oldversion->build == newVersion->build )
+                    diff = 0;
+                else if ( oldversion->build > newVersion->build )
+                    diff = 1;
+                else
+                    diff = -1;
+            }
+            else if ( oldversion->release > newVersion->release )
+                diff = 1;
+            else
+                diff = -1;
+        }
+        else if (  oldversion->minor > newVersion->minor )
+            diff = 1;
+        else
+            diff = -1;
+    }
+    else if ( oldversion->major > newVersion->major )
+        diff = 1;
+    else
+        diff = -1;
+
+    return diff;
+}
+
+
+void
+nsXPINotifierImpl::StringToVersionNumbers(const nsString& version, int32 *aMajor, int32 *aMinor, int32 *aRelease, int32 *aBuild)    
+{
+    PRInt32 errorCode;
+
+    int dot = version.FindChar('.', PR_FALSE,0);
+    
+    if ( dot == -1 ) 
+    {
+        *aMajor = version.ToInteger(&errorCode);
+    }
+    else  
+    {
+        nsString majorStr;
+        version.Mid(majorStr, 0, dot);
+        *aMajor  = majorStr.ToInteger(&errorCode);
+
+        int prev = dot+1;
+        dot = version.FindChar('.',PR_FALSE,prev);
+        if ( dot == -1 ) 
+        {
+            nsString minorStr;
+            version.Mid(minorStr, prev, version.Length() - prev);
+            *aMinor = minorStr.ToInteger(&errorCode);
+        }
+        else 
+        {
+            nsString minorStr;
+            version.Mid(minorStr, prev, dot - prev);
+            *aMinor = minorStr.ToInteger(&errorCode);
+
+            prev = dot+1;
+            dot = version.FindChar('.',PR_FALSE,prev);
+            if ( dot == -1 ) 
+            {
+                nsString releaseStr;
+                version.Mid(releaseStr, prev, version.Length() - prev);
+                *aRelease = releaseStr.ToInteger(&errorCode);
+            }
+            else 
+            {
+                nsString releaseStr;
+                version.Mid(releaseStr, prev, dot - prev);
+                *aRelease = releaseStr.ToInteger(&errorCode);
+    
+                prev = dot+1;
+                if ( version.Length() > dot ) 
+                {
+                    nsString buildStr;
+                    version.Mid(buildStr, prev, version.Length() - prev);
+                    *aBuild = buildStr.ToInteger(&errorCode);
+               }
+            }
+        }
+    }
+}
 
 nsresult
 nsXPINotifierImpl::SynchronouslyOpenRemoteDataSource(const char* aURL,