diff --git a/pisi.e3p b/pisi.e3p
index 9f462000..b604bde1 100644
--- a/pisi.e3p
+++ b/pisi.e3p
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Project SYSTEM "Project-3.8.dtd">
 <!-- Project file for project pisi -->
-<!-- Saved: 2005-12-15, 04:01:47 -->
-<!-- Copyright (C) 2005 PiSi Development Team,  -->
+<!-- Saved: 2006-02-15, 02:00:52 -->
+<!-- Copyright (C) 2006 PiSi Development Team,  -->
 <Project version="3.8">
   <ProgLanguage mixed="0">Python</ProgLanguage>
   <UIType>Qt</UIType>
@@ -11,10 +11,6 @@
   <Author>PiSi Development Team</Author>
   <EmaIl></EmaIl>
   <Sources>
-    <Source>
-      <Dir>tools</Dir>
-      <Name>ebuild2pisi.py</Name>
-    </Source>
     <Source>
       <Dir>tools</Dir>
       <Name>cat-db.py</Name>
@@ -512,9 +508,9 @@
   </Vcs>
   <FiletypeAssociations>
     <FiletypeAssociation pattern="*.ui.h" type="FORMS" />
-    <FiletypeAssociation pattern="*.ptl" type="SOURCES" />
-    <FiletypeAssociation pattern="*.idl" type="INTERFACES" />
     <FiletypeAssociation pattern="*.ui" type="FORMS" />
+    <FiletypeAssociation pattern="*.idl" type="INTERFACES" />
+    <FiletypeAssociation pattern="*.ptl" type="SOURCES" />
     <FiletypeAssociation pattern="*.py" type="SOURCES" />
   </FiletypeAssociations>
 </Project>
diff --git a/pisi/atomicoperations.py b/pisi/atomicoperations.py
index ae5d8d21..aac4f458 100644
--- a/pisi/atomicoperations.py
+++ b/pisi/atomicoperations.py
@@ -104,22 +104,8 @@ class Install(AtomicOperation):
         self.extract_install()
         self.store_pisi_files()
 
-        self.config_later = False
-
-        if self.metadata.package.providesComar:
-            if ctx.comar:
-                import pisi.comariface as comariface
-                self.register_comar_scripts()
-            else:
-                self.config_later = True # configure-pending will register scripts later
-
-        if 'System.Package' in [x.om for x in self.metadata.package.providesComar]:
-            if ctx.comar:
-                ctx.ui.notify(pisi.ui.configuring, package = self.pkginfo, files = self.files)
-                comariface.run_postinstall(self.pkginfo.name)
-                ctx.ui.notify(pisi.ui.configured, package = self.pkginfo, files = self.files)
-            else:
-                self.config_later = True
+        self.register_comar()
+        self.postinstall()
 
         txn = ctx.dbenv.txn_begin()
         try:
@@ -136,7 +122,7 @@ class Install(AtomicOperation):
         else:
             event = pisi.ui.installed
         ctx.ui.notify(event, package = self.pkginfo, files = self.files)
-
+        
     def check_requirements(self):
         """check system requirements"""
         #TODO: IS THERE ENOUGH SPACE?
@@ -221,8 +207,28 @@ class Install(AtomicOperation):
             self.old_files = ctx.installdb.files(pkg.name)
             self.old_path = ctx.installdb.pkg_dir(pkg.name, iversion, irelease)
             self.reinstall = True
-            Remove(pkg.name).run_preremove()
+            self.remove_old = Remove(pkg.name)
+            self.remove_old.run_preremove()
 
+    def register_comar(self):
+        self.config_later = False
+
+        if self.metadata.package.providesComar:
+            if ctx.comar:
+                import pisi.comariface as comariface
+                self.register_comar_scripts()
+            else:
+                self.config_later = True # configure-pending will register scripts later
+
+    def postinstall(self):
+        if 'System.Package' in [x.om for x in self.metadata.package.providesComar]:
+            if ctx.comar:
+                ctx.ui.notify(pisi.ui.configuring, package = self.pkginfo, files = self.files)
+                comariface.run_postinstall(self.pkginfo.name)
+                ctx.ui.notify(pisi.ui.configured, package = self.pkginfo, files = self.files)
+            else:
+                self.config_later = True
+            
     def extract_install(self):
         "unzip package in place"
 
@@ -272,7 +278,7 @@ class Install(AtomicOperation):
     def update_databases(self, txn):
         "update databases"
         if self.reinstall:
-            Remove(self.metadata.package.name).remove_db(txn)
+            self.remove_old.remove_db(txn)
 
         # installdb
         ctx.installdb.install(self.metadata.package.name,