diff --git a/koji.spec b/koji.spec
index 3282be83..c571237a 100644
--- a/koji.spec
+++ b/koji.spec
@@ -109,7 +109,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/kojira
 %{_initrddir}/kojira
 %config(noreplace) %{_sysconfdir}/sysconfig/kojira
-%config(noreplace) %{_sysconfdir}/kojira.conf
+%config(noreplace) %{_sysconfdir}/kojira/kojira.conf
 
 %files web
 %defattr(-,root,root)
diff --git a/util/Makefile b/util/Makefile
index dd44d0d7..20c36cbb 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -21,4 +21,5 @@ install:
 	mkdir -p $(DESTDIR)/etc/sysconfig
 	install -p -m 644 kojira.sysconfig $(DESTDIR)/etc/sysconfig/kojira
 
-	install -p -m 644 kojira.conf $(DESTDIR)/etc/kojira.conf
+	mkdir -p $(DESTDIR)/etc/kojira
+	install -p -m 644 kojira.conf $(DESTDIR)/etc/kojira/kojira.conf
diff --git a/util/kojira b/util/kojira
index 2dacb079..dc6a3225 100755
--- a/util/kojira
+++ b/util/kojira
@@ -356,7 +356,7 @@ def get_options():
     parser = OptionParser("usage: %prog [opts]")
     parser.add_option("-c", "--config", dest="configFile",
                       help="use alternate configuration file", metavar="FILE",
-                      default="/etc/kojira.conf")
+                      default="/etc/kojira/kojira.conf")
     parser.add_option("--user", help="specify user")
     parser.add_option("--password", help="specify password")
     parser.add_option("--principal", help="Kerberos principal")
@@ -400,10 +400,13 @@ def get_options():
                 'prune_batch_size': 4,
                 'max_repo_tasks' : 10,
                 'deleted_repo_lifetime': 7*24*3600,
+                'cert': '/etc/kojira/client.crt',
+                'ca': '/etc/kojira/clientca.crt',
+                'serverca': '/etc/kojira/serverca.crt'
                 }
     if config.has_section(section):
         int_opts = ('prune_batch_size', 'deleted_repo_lifetime', 'max_repo_tasks')
-        str_opts = ('topdir','server','user','password','logfile', 'principal', 'keytab')
+        str_opts = ('topdir','server','user','password','logfile', 'principal', 'keytab', 'cert', 'ca', 'serverca')
         bool_opts = ('with_src','verbose','debug')
         for name in config.options(section):
             if name in int_opts:
@@ -458,10 +461,10 @@ if  __name__ == "__main__":
     else:
         logger.setLevel(logging.WARNING)
     session_opts = {}
-    for k in ('user', 'password', 'debug_xmlrpc', 'debug'):
+    for k in ('cert', 'ca', 'serverca', 'user', 'password', 'debug_xmlrpc', 'debug'):
         session_opts[k] = getattr(options,k)
     session = koji.ClientSession(options.server,session_opts)
-    if options.user:
+    if os.path.isfile(options.cert) or options.user:
         #authenticate using user/password
         session.login()
     elif sys.modules.has_key('krbV') and options.principal and options.keytab:
diff --git a/util/kojira.conf b/util/kojira.conf
index 4633926c..4fd78182 100644
--- a/util/kojira.conf
+++ b/util/kojira.conf
@@ -20,3 +20,14 @@ logfile=/var/log/kojira.log
 
 ; Include srpms in repos? (not needed for normal operation)
 with_src=no
+
+;configuration for SSL athentication
+
+;client certificate
+;cert = /etc/kojira/client.crt
+
+;certificate of the CA that issued the client certificate
+;ca = /etc/kojira/clientca.crt
+
+;certificate of the CA that issued the HTTP server certificate
+;serverca = /etc/kojira/serverca.crt