diff --git a/pisi/index.py b/pisi/index.py
index 44f67bc5..ad8108a6 100644
--- a/pisi/index.py
+++ b/pisi/index.py
@@ -5,7 +5,7 @@
 from package import Package
 from xmlfile import XmlFile
 import metadata
-import packagedb
+from packagedb import packagedb
 from ui import ui
 import util
 from config import config
diff --git a/pisi/install.py b/pisi/install.py
index c1adefa3..950e3606 100644
--- a/pisi/install.py
+++ b/pisi/install.py
@@ -9,7 +9,7 @@ import util
 from config import config
 from ui import ui
 from installdb import installdb
-import packagedb
+from packagedb import packagedb
 import dependency
 from metadata import MetaData
 #import conflicts
diff --git a/samples/startup-notification/startup-notification.pspec b/samples/startup-notification/startup-notification.pspec
index c109a12e..f55fb969 100644
--- a/samples/startup-notification/startup-notification.pspec
+++ b/samples/startup-notification/startup-notification.pspec
@@ -12,10 +12,12 @@
       <Name>Kırmızı kafalar</Name>
       <Email>hotmail@redhat.com</Email>
     </Packager>
-    <License>LGPL-2, BSD</License>
+    <License>LGPL-2</License>
+    <License>BSD</License>
     <IsA>library:x11</IsA>
     <PartOf>rpm:archive</PartOf>
-    <Description>Application startup notification and feedback library</Description>
+    <Description>Application startup notification and feedback library
+    </Description>
     <Archive archType="tarbz2" sha1sum="d2b5698b6209b5172d17222a3117db6447d7cdf1">
         ftp://ftp.linux.org.tr/pub/mirrors/gentoo/distfiles/startup-notification-0.8.tar.bz2
     </Archive>