diff --git a/schema/spacewalk/common/tables/rhnServerNeededCache.sql b/schema/spacewalk/common/tables/rhnServerNeededCache.sql
index 9134e782e0a0..36b7a6c3efc0 100644
--- a/schema/spacewalk/common/tables/rhnServerNeededCache.sql
+++ b/schema/spacewalk/common/tables/rhnServerNeededCache.sql
@@ -53,6 +53,9 @@ CREATE INDEX rhn_snc_cid_idx
     
     ;
 
+CREATE INDEX rhn_snc_seid_idx
+    ON rhnServerNeededCache (server_id, errata_id);
+
 CREATE INDEX rhn_snc_speid_idx
     ON rhnServerNeededCache (server_id, package_id, errata_id)
     
diff --git a/schema/spacewalk/susemanager-schema.changes.kwalter.serverneededcache-index b/schema/spacewalk/susemanager-schema.changes.kwalter.serverneededcache-index
new file mode 100644
index 000000000000..152c93976984
--- /dev/null
+++ b/schema/spacewalk/susemanager-schema.changes.kwalter.serverneededcache-index
@@ -0,0 +1 @@
+- add index on server needed cache to improve performance for some queries (bsc#1211912)
diff --git a/schema/spacewalk/upgrade/susemanager-schema-4.4.6-to-susemanager-schema-4.4.7/002-add-serverneededcache-index.sql b/schema/spacewalk/upgrade/susemanager-schema-4.4.6-to-susemanager-schema-4.4.7/002-add-serverneededcache-index.sql
new file mode 100644
index 000000000000..f4c802b6a474
--- /dev/null
+++ b/schema/spacewalk/upgrade/susemanager-schema-4.4.6-to-susemanager-schema-4.4.7/002-add-serverneededcache-index.sql
@@ -0,0 +1,2 @@
+CREATE INDEX IF NOT EXISTS rhn_snc_seid_idx
+    ON rhnServerNeededCache (server_id, errata_id);