diff --git a/server/eit/commands/__init__.py b/server/eit/commands/__init__.py
index 94fe41c99..33fde2420 100644
--- a/server/eit/commands/__init__.py
+++ b/server/eit/commands/__init__.py
@@ -9,9 +9,19 @@
     B{Entropy Infrastructure Toolkit}.
 
 """
-# TODO: use automatic loader
-from eit.commands.help import EitHelp
-from eit.commands.status import EitStatus
-from eit.commands.commit import EitCommit
-from eit.commands.add import EitAdd
-from eit.commands.repack import EitRepack
+import os
+import sys
+
+_cur_file = sys.modules[__name__].__file__
+_cur_dir = os.path.dirname(_cur_file)
+_excluded_mods = ["descriptor"]
+for py_file in os.listdir(_cur_dir):
+    if not py_file.endswith(".py"):
+        continue
+    if py_file.startswith("_"):
+        continue
+    # strip .py
+    _mod = "eit.commands." + py_file[:-3]
+    if _mod in _excluded_mods:
+        continue
+    __import__(_mod)