diff --git a/zsh.changes b/zsh.changes
index e2c3ad8..5fc0c73 100644
--- a/zsh.changes
+++ b/zsh.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 24 09:00:37 UTC 2011 - idoenmez@suse.de
+
+- Add custom completion support via /etc/zsh_completion.d 
+- Fix build with new ncurses library
+
 -------------------------------------------------------------------
 Mon Aug  1 23:17:10 UTC 2011 - crrodriguez@opensuse.org
 
diff --git a/zsh.spec b/zsh.spec
index 2ba754a..e7079ab 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -129,7 +129,11 @@ perl -p -i -e 's|/usr/local/bin|%{_bindir}|' \
     --enable-cap \
     --enable-multibyte \
     --enable-pcre \
-    --with-term-lib=ncursesw \
+%if 0%{?suse_version} >= 1220
+    --with-term-lib="ncursesw tinfo" \
+%else
+    --with-term-lib="ncursesw" \
+%endif
     --enable-cflags="%{optflags} %(ncursesw6-config --cflags)" \
     --enable-ldflags="%(ncursesw6-config --libs)"
 
@@ -170,6 +174,9 @@ install -m 0755 -Dd  %{buildroot}/{etc,bin}
 %if 0%{?suse_version}
 # install SUSE configuration
 install -m 0644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{buildroot}%{_sysconfdir}
+
+# Create custom completion directory
+mkdir %{buildroot}/etc/zsh_completion.d
 %endif
 
 %if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version}
@@ -267,6 +274,10 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/skel/.zshrc
 %endif
 
+%if 0%{?suse_version}
+%dir /etc/zsh_completion.d
+%endif
+
 %{_bindir}/zsh
 /bin/zsh
 %{_libdir}/zsh/
diff --git a/zshrc b/zshrc
index 7dd87b2..a7061b0 100644
--- a/zshrc
+++ b/zshrc
@@ -2,6 +2,11 @@
 # to re-implement here
 source /etc/bash.bashrc
 
+# Custom completion support via /etc/zsh_completion.d
+for i in /etc/zsh_completion.d/*(N); do 
+    test -r $i && . $i
+done
+
 # zsh line editing
 : ${ZSHEDIT:="emacs"}
 : ${TERM:=linux}