diff --git a/ChangeLog b/ChangeLog
index c665f9dc9fb06bf9fcca2eada607e3ee029fcd68..49bf2ce17cc07c2ccc3e62156d99f25388d83a8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,7 @@ version 0.9.7 -- UNRELEASED
 	rdiff:
 	 . Fix include/exclude paths with spaces (Closes: #398435)
 	 . Fix confusing error if rdiff-backup cannot be found on remote server.
+	 . Increased element number in include/exclude and vserver ninjahelper interface
 	sys:
 	 . New luksheaders option (default=disabled) to backup the Luks header
 	   of every Luks device.
diff --git a/handlers/dup.helper.in b/handlers/dup.helper.in
index ae48e4cdd147c0b81b28ed7c7f414d1a4d82c759..8b344dcf81759b42e21e881b66a4e35359d4594b 100644
--- a/handlers/dup.helper.in
+++ b/handlers/dup.helper.in
@@ -18,6 +18,11 @@ do_dup_host_includes() {
          formItem include ""
          formItem include ""
          formItem include ""
+         formItem include ""
+         formItem include ""
+         formItem include ""
+         formItem include ""
+         formItem include ""
          formDisplay
       [ $? = 0 ] || return 1
       dup_includes="$REPLY"
@@ -42,6 +47,11 @@ do_dup_vserver() {
          formItem include ""
          formItem include ""
          formItem include ""
+         formItem include ""
+         formItem include ""
+         formItem include ""
+         formItem include ""
+         formItem include ""
       formDisplay
       [ $? = 0 ] || return 1
       dup_vsincludes="$REPLY"
@@ -59,6 +69,11 @@ do_dup_excludes() {
      formItem exclude ""
      formItem exclude ""
      formItem exclude ""
+     formItem exclude ""
+     formItem exclude ""
+     formItem exclude ""
+     formItem exclude ""
+     formItem exclude ""
    formDisplay
    [ $? = 0 ] || return 1
    dup_excludes="$REPLY"
diff --git a/handlers/rdiff.helper.in b/handlers/rdiff.helper.in
index 83f2fb5faed18ae29a184092aeb216beb63c9c82..e35d6297f5babc58e6633826b6e7e5477e35d5ab 100644
--- a/handlers/rdiff.helper.in
+++ b/handlers/rdiff.helper.in
@@ -22,6 +22,11 @@ do_rdiff_host_includes() {
          formItem include
          formItem include
          formItem include
+         formItem include
+         formItem include
+         formItem include
+         formItem include
+         formItem include
       formDisplay
       [ $? = 0 ] || return
       unset rdiff_includes
@@ -49,6 +54,11 @@ do_rdiff_vserver() {
          formItem include ""
          formItem include ""
          formItem include ""
+         formItem include ""
+         formItem include ""
+         formItem include ""
+         formItem include ""
+         formItem include ""
       formDisplay
       [ $? = 0 ] || return 1
       rdiff_vsincludes=($REPLY)
@@ -66,6 +76,12 @@ do_rdiff_excludes() {
      done
      formItem exclude
      formItem exclude
+     formItem exclude
+     formItem exclude
+     formItem exclude
+     formItem exclude
+     formItem exclude
+     formItem exclude
    formDisplay
    [ $? = 0 ] || return
    unset rdiff_excludes