diff --git a/pisi/index.py b/pisi/index.py
index f1b73070..38ec6cb1 100644
--- a/pisi/index.py
+++ b/pisi/index.py
@@ -1,3 +1,5 @@
+# PISI source/package index
+# Author:  Eray Ozkural <eray@uludag.org.tr>
 
 from package import Package
 from xmlfile import XmlFile
diff --git a/pisi/install.py b/pisi/install.py
index 81808981..d9336979 100644
--- a/pisi/install.py
+++ b/pisi/install.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+# Package install operation
+# Author:  Eray Ozkural <eray@uludag.org.tr>
 
 #import package
 from specfile import *
diff --git a/pisi/installdb.py b/pisi/installdb.py
index 7aa96f83..4d270c35 100644
--- a/pisi/installdb.py
+++ b/pisi/installdb.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # installation database
-# maintainer: eray and caglar
+# Author:  Eray Ozkural <eray@uludag.org.tr>
+
 
 import os
 import bsddb.dbshelve as shelve
diff --git a/pisi/metadata.py b/pisi/metadata.py
index ea51b1ab..88e1aa03 100644
--- a/pisi/metadata.py
+++ b/pisi/metadata.py
@@ -2,6 +2,8 @@
 # generated during the build process of a package and used in the
 # installation. Package repository also uses metadata.xml for building
 # a package index.
+# Authors:  Eray Ozkural <eray@uludag.org.tr>
+#           Baris Metin <baris@uludag.org.tr
 
 from ui import ui
 
diff --git a/pisi/packagedb.py b/pisi/packagedb.py
index 2f590dd4..4c1ac31c 100644
--- a/pisi/packagedb.py
+++ b/pisi/packagedb.py
@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 # package database
 # interface for update/query to local package repository
-# maintainer: eray and caglar
+# Authors:  Eray Ozkural <eray@uludag.org.tr>
+#           Baris Metin <baris@uludag.org.tr
 
 # we basically store everything in PackageInfo class
 # yes, we are cheap
diff --git a/pisi/sourcearchive.py b/pisi/sourcearchive.py
index cdb9b6e4..887b2c41 100644
--- a/pisi/sourcearchive.py
+++ b/pisi/sourcearchive.py
@@ -1,4 +1,7 @@
 # python standard library
+# Authors: Baris Metin <baris@uludag.org.tr
+#          Eray Ozkural <eray@uludag.org.tr>
+
 import os
 import sys
 
diff --git a/pisi/sourcedb.py b/pisi/sourcedb.py
index 71af3727..fcf3b421 100644
--- a/pisi/sourcedb.py
+++ b/pisi/sourcedb.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # package source database
 # interface for update/query to local package repository
-# maintainer: eray and caglar
+# Author:  Eray Ozkural <eray@uludag.org.tr>
 
 # we basically store everything in sourceinfo class
 # yes, we are cheap
diff --git a/pisi/specfile.py b/pisi/specfile.py
index c4c7b358..ddb14d6b 100644
--- a/pisi/specfile.py
+++ b/pisi/specfile.py
@@ -4,6 +4,9 @@
 # files are specification files for PISI source packages. This module
 # provides read and write access to PSPEC files.
 
+# Authors:  Eray Ozkural <eray@uludag.org.tr>
+#           Baris Metin <baris@uludag.org.tr
+
 # standard python modules
 import xml.dom.minidom
 from os.path import basename
diff --git a/pisi/ui.py b/pisi/ui.py
index 567b259a..3f8b9249 100644
--- a/pisi/ui.py
+++ b/pisi/ui.py
@@ -1,4 +1,6 @@
 # generic user interface
+# Authors:  Eray Ozkural <eray@uludag.org.tr>
+#           Murat Eren <meren@uludag.org.tr>
 
 import sys
 from colors import colorize
diff --git a/pisi/util.py b/pisi/util.py
index 1fb53c3a..5b211508 100644
--- a/pisi/util.py
+++ b/pisi/util.py
@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 # misc. utility functions, including process and file utils
-# maintainer: eray and caglar and baris and meren!
+
+# Authors:  Eray Ozkural <eray@uludag.org.tr>
+#           Baris Metin <baris@uludag.org.tr>
+#           S. Caglar Onur <caglar@uludag.org.tr>
+#           A. Murat Eren <meren@uludag.org.tr>
 
 import os
 import sys
diff --git a/pisi/version.py b/pisi/version.py
index 020d5022..e7518583 100644
--- a/pisi/version.py
+++ b/pisi/version.py
@@ -1,4 +1,5 @@
 # version structure
+# Authors:  Eray Ozkural <eray@uludag.org.tr>
 
 import util
 
diff --git a/pisi/xmlext.py b/pisi/xmlext.py
index b11a5876..a382a723 100644
--- a/pisi/xmlext.py
+++ b/pisi/xmlext.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 # some helper functions for using minidom
+# works well enough for now... :/
+# Authors:  Eray Ozkural <eray@uludag.org.tr>
+#           Baris Metin <baris@uludag.org.tr
 
 import xml.dom.minidom as mdom
 
diff --git a/pisi/xmlfile.py b/pisi/xmlfile.py
index ff8b7de7..c990e746 100644
--- a/pisi/xmlfile.py
+++ b/pisi/xmlfile.py
@@ -7,6 +7,9 @@
 # high-level dom functions provided in xml module (and sorely lacking
 # in xml.dom :( )
 
+# Authors:  Eray Ozkural <eray@uludag.org.tr>
+#           Baris Metin <baris@uludag.org.tr
+
 import xml.dom.minidom as mdom
 
 from xmlext import *