diff --git a/libraries/databaseTools.py b/libraries/databaseTools.py
index bda91ef9a..6f53f55d3 100644
--- a/libraries/databaseTools.py
+++ b/libraries/databaseTools.py
@@ -88,11 +88,11 @@ def database(options):
 	    currCounter += 1
 	    print_info(green("  (")+ blue(str(currCounter))+"/"+red(str(atomsnumber))+green(") ")+red("Analyzing ")+bold(pkg)+red(" ..."))
 	    etpData = reagentTools.extractPkgData(package = etpConst['packagesbindir']+"/"+pkg, structuredLayout = True)
-		
 	    # remove shait
-	    entropyTools.spawnCommand("rm -rf "+etpConst['packagestmpdir']+"/"+pkg)
+	    entropyTools.spawnCommand("rm -rf "+etpConst['packagestmpdir']+"/"+pkg+"*")
 	    # fill the db entry
-	    dbconn.addPackage(etpData)
+	    idpk, revision, etpDataUpdated, accepted = dbconn.addPackage(etpData)
+	    
 	    dbconn.commitChanges()
 	
 	dbconn.closeDB()
diff --git a/libraries/entropyConstants.py b/libraries/entropyConstants.py
index 75ad72839..0229b4a51 100644
--- a/libraries/entropyConstants.py
+++ b/libraries/entropyConstants.py
@@ -346,6 +346,7 @@ etpConst = {
     'filesystemdirs': ['/bin','/boot','/emul','/etc','/lib','/lib32','/lib64','/opt','/sbin','/usr','/var'], # directory of the filesystem
     'officialrepositoryname': "sabayonlinux.org", # our official repository name
     'packagedbdir': "/db", # directory of the database file in the .tbz2 package
+    'packagedbfile': "/data.db", # database file in the directory above
     'packagecontentdir': "/package" # directory of the package file in the .tbz2 package
  }
 
diff --git a/libraries/reagentTools.py b/libraries/reagentTools.py
index d6392e6c9..068a4947e 100644
--- a/libraries/reagentTools.py
+++ b/libraries/reagentTools.py
@@ -142,7 +142,7 @@ def enzyme(options):
 	    os.makedirs(tdir)
 	    os.mkdir(tdir+etpConst['packagecontentdir']) # content directory
 	    os.mkdir(tdir+etpConst['packagedbdir']) # content directory
-	    dbpath = tdir+etpConst['packagedbdir']+"/data.db"
+	    dbpath = tdir+etpConst['packagedbdir']+etpConst['packagedbfile']
 	    # fill /package
 	    spawnCommand("mv "+etpConst['packagessuploaddir']+"/"+newFileName+" "+tdir+etpConst['packagecontentdir']+"/")
 	    # create db
@@ -161,7 +161,6 @@ def enzyme(options):
 	    hashFilePath = createHashFile(etpConst['packagessuploaddir']+"/"+newFileName)
 	    # remove tdir
 	    spawnCommand("rm -rf "+tdir)
-	    
 	    print_info(yellow(" * ")+red("Database injection complete for ")+newFileName)
 	    
 	else:
@@ -214,6 +213,10 @@ def extractPkgData(package, etpBranch = "unstable", structuredLayout = False):
     etpData['name'] = pkgname
     etpData['version'] = pkgver
 
+    print_info(yellow(" * ")+red("Getting package md5..."),back = True)
+    # .tbz2 md5
+    etpData['digest'] = md5sum(tbz2File)
+
     if (structuredLayout):
 	# extract tbz2
 	structuredPackageDir = etpConst['packagestmpdir']+"/"+etpData['name']+"-"+etpData['version']+"-structured"
@@ -224,10 +227,6 @@ def extractPkgData(package, etpBranch = "unstable", structuredLayout = False):
 	tbz2filename = os.path.basename(tbz2File)
 	tbz2File = structuredPackageDir+etpConst['packagecontentdir']+"/"+tbz2filename
 
-    print_info(yellow(" * ")+red("Getting package md5..."),back = True)
-    # .tbz2 md5
-    etpData['digest'] = md5sum(tbz2File)
-
     print_info(yellow(" * ")+red("Getting package mtime..."),back = True)
     # .tbz2 md5
     etpData['datecreation'] = str(getFileUnixMtime(tbz2File))