diff --git a/cdist/conf/type/__rvm_gemset/gencode-remote b/cdist/conf/type/__rvm_gemset/gencode-remote
index 1fd14061..f0c0052b 100755
--- a/cdist/conf/type/__rvm_gemset/gencode-remote
+++ b/cdist/conf/type/__rvm_gemset/gencode-remote
@@ -24,7 +24,6 @@ ruby="$(echo "$gemset" | cut -d '@' -f 1)"
 gemsetname="$(echo "$gemset" | cut -d '@' -f 2)"
 state_is="$(cat "$__object/explorer/state")"
 user="$(cat "$__object/parameter/user")"
-default="$(cat "$__object/parameter/default" 2>/dev/null || true)"
 state_should="$(cat "$__object/parameter/state")"
 
 [ "$state_is" = "$state_should" ] && exit 0
@@ -34,15 +33,12 @@ case "$state_should" in
         cat << DONE
 su - "$user" -c "source ~/.rvm/scripts/rvm; rvm $gemset --create"
 DONE
-        case "$default" in
-            no)
-            ;;
-            *)
-                cat << DONE
+        if -f "$__object/parameter/default"; then
+            cat << DONE
 su - "$user" -c "source ~/.rvm/scripts/rvm; rvm use --default $gemset"
 DONE
-            ;;
-        esac
+        fi
+
     ;;
     absent)
         cat << DONE
diff --git a/cdist/conf/type/__rvm_gemset/man.text b/cdist/conf/type/__rvm_gemset/man.text
index 26e866ba..44c0c555 100644
--- a/cdist/conf/type/__rvm_gemset/man.text
+++ b/cdist/conf/type/__rvm_gemset/man.text
@@ -20,10 +20,11 @@ user::
 state::
     Either "present" or "absent".
 
-OPTIONAL PARAMETERS
+BOOLEAN PARAMETERS
 -------------------
 default::
-    If set to anything but "no" (the default), set the given gemset as default.
+    If present, set the given gemset as default.
+
 
 EXAMPLES
 --------
@@ -33,7 +34,7 @@ EXAMPLES
 __rvm_gemset ruby-1.9.3-p0@myset --user charles --state present
 
 # Do the same and make ruby-1.9.3-p0@myset the default gemset
-__rvm_gemset ruby-1.9.3-p0@myset --user charles --state present --default yes
+__rvm_gemset ruby-1.9.3-p0@myset --user charles --state present --default
 
 # Remove the gemset @myset for user john
 __rvm_ruby ruby-1.9.3-p0@myset --user john --state absent
diff --git a/cdist/conf/type/__rvm_gemset/parameter/optional b/cdist/conf/type/__rvm_gemset/parameter/boolean
similarity index 100%
rename from cdist/conf/type/__rvm_gemset/parameter/optional
rename to cdist/conf/type/__rvm_gemset/parameter/boolean