diff --git a/lib/ulib/ptools b/lib/ulib/ptools
index 4f9d74b..f589de8 100644
--- a/lib/ulib/ptools
+++ b/lib/ulib/ptools
@@ -18,11 +18,11 @@ function is_any_branch() {
         case "$spec" in
         m|master)
             [ -n "$r" ] || r=1
-            [ "$branch" == "master" ] && return 0
+            [ "$branch" == master ] && return 0
             ;;
         d|develop)
             [ -n "$r" ] || r=1
-            [ "$branch" == "develop" ] && return 0
+            [ "$branch" == develop ] && return 0
             ;;
         r|release)
             [ -n "$r" ] || r=1
@@ -34,20 +34,21 @@ function is_any_branch() {
             ;;
         f|feature|t|topic)
             [ -n "$r" ] || r=1
-            [ "$branch" == "master" ] && continue
-            [ "$branch" == "develop" ] && continue
+            [ "$branch" == master ] && continue
+            [ "$branch" == develop ] && continue
             [[ "$branch" == release-* ]] && continue
             [[ "$branch" == hotfix-* ]] && continue
             [ -n "$annex" -a "$branch" == "git-annex" ] && continue
+            [[ "$branch" == wip/* ]] && return 0
             [[ "$branch" == */* ]] && continue
             return 0
             ;;
         -m|-master)
             [ -n "$r" ] || r=0
-            [ "$branch" == "master" ] && return 1;;
+            [ "$branch" == master ] && return 1;;
         -d|-develop)
             [ -n "$r" ] || r=0
-            [ "$branch" == "develop" ] && return 1;;
+            [ "$branch" == develop ] && return 1;;
         -r|-release)
             [ -n "$r" ] || r=0
             [[ "$branch" == release-* ]] && return 1;;
@@ -56,11 +57,12 @@ function is_any_branch() {
             [[ "$branch" == hotfix-* ]] && return 1;;
         -f|-feature|-t|-topic)
             [ -n "$r" ] || r=0
-            [ "$branch" == "master" ] && continue
-            [ "$branch" == "develop" ] && continue
+            [ "$branch" == master ] && continue
+            [ "$branch" == develop ] && continue
             [[ "$branch" == release-* ]] && continue
             [[ "$branch" == hotfix-* ]] && continue
             [ -n "$annex" -a "$branch" == "git-annex" ] && continue
+            [[ "$branch" == wip/* ]] && return 1
             [[ "$branch" == */* ]] && continue
             return 1
             ;;
@@ -89,7 +91,7 @@ function list_feature_branches() {
     grep -vF develop |
     grep -v '^release-' |
     grep -v '^hotfix-' |
-    grep -v '/' |
+    grep -Pv '(?<!^wip)/' |
     if git_have_annex; then
         grep -vF git-annex
     else